Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use main branch instead of master #153

Merged
merged 1 commit into from
Dec 13, 2023
Merged

use main branch instead of master #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/tox_lsr/config_files/tox-default.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ setenv =
LSR_CONFIGDIR = {lsr_configdir}
LSR_TOX_ENV_NAME = {envname}
LSR_TOX_ENV_DIR = {envdir}
LSR_ROLE2COLL_VERSION = master
LSR_ROLE2COLL_VERSION = main
LSR_ROLE2COLL_NAMESPACE = fedora
LSR_ROLE2COLL_NAME = linux_system_roles
LSR_TOX_ENV_TMP_DIR = {envtmpdir}
Expand Down Expand Up @@ -221,7 +221,7 @@ deps =
jmespath
ruamel.yaml
commands =
bash {lsr_scriptdir}/runcollection.sh {env:LSR_ROLE2COLL_VERSION:master}
bash {lsr_scriptdir}/runcollection.sh {env:LSR_ROLE2COLL_VERSION:main}

[testenv:shellcheck]
changedir = {env:LSR_RUN_TEST_DIR:{toxinidir}}
Expand Down Expand Up @@ -386,7 +386,7 @@ deps =
setenv = # change this to ANSIBLE_COLLECTIONS_PATH if using a later ansible version
ANSIBLE_COLLECTIONS_PATHS = {envdir}
commands =
curl -L -o {envdir}/report-modules-plugins.py https://raw.githubusercontent.com/linux-system-roles/auto-maintenance/master/report-modules-plugins.py
curl -L -o {envdir}/report-modules-plugins.py https://raw.githubusercontent.com/linux-system-roles/auto-maintenance/main/report-modules-plugins.py
bash -c '\
set -euxo pipefail; \
for file in meta/collection-requirements.yml tests/collection-requirements.yml; do \
Expand Down
2 changes: 1 addition & 1 deletion src/tox_lsr/test_scripts/runcollection.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SCRIPTDIR=$(readlink -f "$(dirname "$0")")

# Collection commands that are run when `tox -e collection`:
role=$(basename "${TOPDIR}")
STABLE_TAG=${1:-master}
STABLE_TAG=${1:-main}

testlist="yamllint,flake8,shellcheck,ansible-plugin-scan"
# py38 - pyunit testing is not yet supported
Expand Down
6 changes: 3 additions & 3 deletions tests/fixtures/test_tox_merge_ini/result.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ setenv = PYTHONPATH = {env:LSR_PYTHONPATH:}{toxinidir}/library:{toxinidir}/modul
LSR_CONFIGDIR = {lsr_configdir}
LSR_TOX_ENV_NAME = {envname}
LSR_TOX_ENV_DIR = {envdir}
LSR_ROLE2COLL_VERSION = master
LSR_ROLE2COLL_VERSION = main
LSR_ROLE2COLL_NAMESPACE = fedora
LSR_ROLE2COLL_NAME = linux_system_roles
LSR_TOX_ENV_TMP_DIR = {envtmpdir}
Expand Down Expand Up @@ -184,7 +184,7 @@ commands = {[testenv:molecule_version]commands}
changedir = {toxinidir}
deps = jmespath
ruamel.yaml
commands = bash {lsr_scriptdir}/runcollection.sh {env:LSR_ROLE2COLL_VERSION:master}
commands = bash {lsr_scriptdir}/runcollection.sh {env:LSR_ROLE2COLL_VERSION:main}

[testenv:shellcheck]
changedir = {env:LSR_RUN_TEST_DIR:{toxinidir}}
Expand Down Expand Up @@ -306,7 +306,7 @@ deps = ansible==6.*
jinja2==2.7.* ; python_version <= "3.7"
setenv = # change this to ANSIBLE_COLLECTIONS_PATH if using a later ansible version
ANSIBLE_COLLECTIONS_PATHS = {envdir}
commands = curl -L -o {envdir}/report-modules-plugins.py https://raw.githubusercontent.com/linux-system-roles/auto-maintenance/master/report-modules-plugins.py
commands = curl -L -o {envdir}/report-modules-plugins.py https://raw.githubusercontent.com/linux-system-roles/auto-maintenance/main/report-modules-plugins.py
bash -c '\
set -euxo pipefail; \
for file in meta/collection-requirements.yml tests/collection-requirements.yml; do \
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/test_hooks4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"passenv": "*",
"setenv": (
"\nLC_ALL = C.UTF-8"
"\nLSR_ROLE2COLL_VERSION = master"
"\nLSR_ROLE2COLL_VERSION = main"
"\nLSR_ROLE2COLL_NAMESPACE = fedora"
"\nLSR_ROLE2COLL_NAME = linux_system_roles"
"\nLSR_SCRIPTDIR = {lsr_scriptdir}"
Expand Down Expand Up @@ -69,7 +69,7 @@
"passenv": "*",
"setenv": (
"\nLC_ALL = C.UTF-8"
"\nLSR_ROLE2COLL_VERSION = master"
"\nLSR_ROLE2COLL_VERSION = main"
"\nLSR_ROLE2COLL_NAMESPACE = fedora"
"\nLSR_ROLE2COLL_NAME = linux_system_roles"
"\nLSR_SCRIPTDIR = ./scripts"
Expand Down Expand Up @@ -112,7 +112,7 @@
"passenv": "*",
"setenv": (
"\nLC_ALL = C.UTF-8"
"\nLSR_ROLE2COLL_VERSION = master"
"\nLSR_ROLE2COLL_VERSION = main"
"\nLSR_ROLE2COLL_NAMESPACE = fedora"
"\nLSR_ROLE2COLL_NAME = linux_system_roles"
"\nLSR_SCRIPTDIR = ./scripts"
Expand Down