From 8e1d778ecc8188928c34790d25186424bfda8397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Mon, 7 Oct 2024 12:38:21 +0200 Subject: [PATCH] ci: fix paths to point to gitlab.postmarketos.org (MR 5696) --- .ci/apkbuild-lint.sh | 2 +- .ci/autoupdate.sh | 6 +++--- .ci/commits.sh | 2 +- .ci/grep.sh | 2 +- .ci/kconfig.sh | 2 +- .ci/lib/build_changed_aports.sh | 2 +- .ci/lib/common.py | 2 +- .ci/pytest.sh | 2 +- .ci/testcases/test_directory_structure.py | 2 +- .gitlab-ci.yml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci/apkbuild-lint.sh b/.ci/apkbuild-lint.sh index e7505f77f..636426791 100755 --- a/.ci/apkbuild-lint.sh +++ b/.ci/apkbuild-lint.sh @@ -6,7 +6,7 @@ if [ "$(id -u)" = 0 ]; then set -x - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh exec su "${TESTUSER:-pmos}" -c "sh -e $0" fi diff --git a/.ci/autoupdate.sh b/.ci/autoupdate.sh index c601aa7b7..78c5ce56e 100755 --- a/.ci/autoupdate.sh +++ b/.ci/autoupdate.sh @@ -6,7 +6,7 @@ if [ "$(id -u)" = 0 ]; then set -x apk add git openssh-keygen grep curl - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh exec su "${TESTUSER:-pmos}" -c "sh -e $0 $*" fi @@ -90,9 +90,9 @@ update_linux_next() { } # For testing -#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports-autoupdate-test.git +#git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports-autoupdate-test.git -git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.com/postmarketOS/pmaports.git +git remote add gitlab https://pmos-ci:"$PMAPORTS_PUSH_TOKEN"@gitlab.postmarketos.org/postmarketOS/pmaports.git git fetch gitlab git checkout --track gitlab/master diff --git a/.ci/commits.sh b/.ci/commits.sh index 7f525cdcc..6cda79118 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.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh fi exec su "${TESTUSER:-pmos}" -c "sh -e $0" diff --git a/.ci/grep.sh b/.ci/grep.sh index 67173fc95..08924b01a 100755 --- a/.ci/grep.sh +++ b/.ci/grep.sh @@ -57,7 +57,7 @@ fi POSTMARKETOS_WALLPAPER_PATH='/usr/share/wallpapers/postmarketos.jpg' # The excluded devices are "grandfathered in". New devices should not be added here. -# See https://gitlab.com/postmarketOS/pmaports/-/issues/2529 +# See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2529 if grep -qr $POSTMARKETOS_WALLPAPER_PATH \ --exclude-dir='device-pine64-pinetab' \ --exclude-dir='device-oneplus-kebab' \ diff --git a/.ci/kconfig.sh b/.ci/kconfig.sh index 4a8e03133..44056cf08 100755 --- a/.ci/kconfig.sh +++ b/.ci/kconfig.sh @@ -6,7 +6,7 @@ if [ "$(id -u)" = 0 ]; then set -x - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/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 d9626bdc0..e05d7b40e 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.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh exec su "${TESTUSER:-pmos}" -c "sh -e $0" fi diff --git a/.ci/lib/common.py b/.ci/lib/common.py index 84f8b2811..ab1580a07 100755 --- a/.ci/lib/common.py +++ b/.ci/lib/common.py @@ -36,7 +36,7 @@ def run_git(parameters, check=True, stderr=None): def add_upstream_git_remote(): """ Add a remote pointing to postmarketOS/pmaports. """ run_git(["remote", "add", "upstream", - "https://gitlab.com/postmarketOS/pmaports.git"], False) + "https://gitlab.postmarketos.org/postmarketOS/pmaports.git"], False) run_git(["fetch", "-q", "upstream"]) diff --git a/.ci/pytest.sh b/.ci/pytest.sh index d1eea5150..2baa8ea17 100755 --- a/.ci/pytest.sh +++ b/.ci/pytest.sh @@ -8,7 +8,7 @@ if [ "$(id -u)" = 0 ]; then set -x - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" + wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh" sh ./install_pmbootstrap.sh pytest exec su "${TESTUSER:-pmos}" -c "sh -e $0" fi diff --git a/.ci/testcases/test_directory_structure.py b/.ci/testcases/test_directory_structure.py index bfb33cf07..a5fd49649 100644 --- a/.ci/testcases/test_directory_structure.py +++ b/.ci/testcases/test_directory_structure.py @@ -28,7 +28,7 @@ def test_directories(): # Ensure no file in pmaports are executable. -# see https://gitlab.com/postmarketOS/pmaports/-/issues/593. +# see https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/593. def test_executable_files(): for file in glob.iglob("[!temp]**/**/*", recursive=True): if os.path.isdir(file) or os.path.islink(file): diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42c174c82..b7d1093b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,7 +119,7 @@ mr-settings: - *global_before_scripts - apk -q add python3 script: - - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py" + - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py" - python3 ./check_mr_settings.py # build changed aports