diff --git a/.ci/autoupdate.sh b/.ci/autoupdate.sh index 1dbfa56b8..39a7b0504 100755 --- a/.ci/autoupdate.sh +++ b/.ci/autoupdate.sh @@ -3,7 +3,7 @@ if [ "$(id -u)" = 0 ]; then set -x apk add git openssh-keygen grep curl - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh exec su "${TESTUSER:-pmos}" -c "sh -e $0 $*" fi diff --git a/.ci/commits.sh b/.ci/commits.sh index 6cda79118..6679d2bd3 100755 --- a/.ci/commits.sh +++ b/.ci/commits.sh @@ -11,7 +11,7 @@ if [ "$(id -u)" = 0 ]; then # In .gitlab-ci.yml currently .ci/pytest.sh runs before this and # already downloads and runs install_pmbootstrap.sh. if ! [ -e install_pmbootstrap.sh ]; then - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh fi exec su "${TESTUSER:-pmos}" -c "sh -e $0" diff --git a/.ci/kconfig.sh b/.ci/kconfig.sh index 44056cf08..a17fe0c71 100755 --- a/.ci/kconfig.sh +++ b/.ci/kconfig.sh @@ -6,7 +6,7 @@ if [ "$(id -u)" = 0 ]; then set -x - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh exec su "${TESTUSER:-pmos}" -c "sh -e $0" fi diff --git a/.ci/lib/build_changed_aports.sh b/.ci/lib/build_changed_aports.sh index e05d7b40e..d3d7acdc3 100755 --- a/.ci/lib/build_changed_aports.sh +++ b/.ci/lib/build_changed_aports.sh @@ -5,7 +5,7 @@ if [ "$(id -u)" = 0 ]; then set -x - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh exec su "${TESTUSER:-pmos}" -c "sh -e $0" fi diff --git a/.ci/pytest.sh b/.ci/pytest.sh index 752c3fab3..f96f0131f 100755 --- a/.ci/pytest.sh +++ b/.ci/pytest.sh @@ -8,7 +8,7 @@ if [ "$(id -u)" = 0 ]; then set -x - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh pytest exec su "${TESTUSER:-pmos}" -c "sh -e $0" fi diff --git a/.ci/verify-checksums.sh b/.ci/verify-checksums.sh index f598839f2..c316994b0 100755 --- a/.ci/verify-checksums.sh +++ b/.ci/verify-checksums.sh @@ -6,7 +6,7 @@ if [ "$(id -u)" = 0 ]; then set -x - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh exec su "${TESTUSER:-pmos}" -c "sh -e $0" fi diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4ddbf129..ed2fd3e79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,7 +153,7 @@ mr-settings: before_script: - apk -q add python3 script: - - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py" + - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/check_mr_settings.py" - python3 ./check_mr_settings.py # Calculate build of changed aports using a dynamic downstream pipelines: @@ -172,7 +172,7 @@ generate-build-jobs: - .ci/lib/gitlab_prepare_ci.sh needs: [] script: - - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/install_pmbootstrap.sh" - sh ./install_pmbootstrap.sh py3-jinja2 # HACK: Make the pmb library happy to use the currently-cloned pmaports repo diff --git a/cross/.gitlab-ci.yml b/cross/.gitlab-ci.yml index 47f51ffb1..b7097821f 100644 --- a/cross/.gitlab-ci.yml +++ b/cross/.gitlab-ci.yml @@ -2,7 +2,7 @@ cross-gcc-tests: extends: .package-test tags: [qemu] before_script: - - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/main/install_pmbootstrap.sh" - sh ./install_pmbootstrap.sh script: - su pmos -c "pmbootstrap build gcc-aarch64"