From 5da1b74db08d99d7da60eed2f443586ebbe08a37 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Sun, 15 Mar 2026 16:42:15 +0100 Subject: [PATCH] ci: replace master strings with main Signed-off-by: Aster Boese Part-of: --- .ci/build-docs.sh | 2 +- .ci/dint.sh | 2 +- .ci/lib/check_changed_versions.py | 2 +- .ci/lib/check_devices_in_wiki.py | 2 +- .ci/lib/common.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/build-docs.sh b/.ci/build-docs.sh index 8be78daf8..5f8961ff9 100755 --- a/.ci/build-docs.sh +++ b/.ci/build-docs.sh @@ -11,7 +11,7 @@ if [ "$(id -u)" = 0 ]; then set -x apk -q add py3-pip make git - apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master + apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/main exec su "${TESTUSER:-build}" -c "sh -e $0" fi diff --git a/.ci/dint.sh b/.ci/dint.sh index 22b365ffd..432158e86 100755 --- a/.ci/dint.sh +++ b/.ci/dint.sh @@ -6,7 +6,7 @@ if [ "$(id -u)" = 0 ]; then set -x apk add git python3 - apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/master + apk add dint --allow-untrusted --repository=https://mirror.postmarketos.org/postmarketos/main exec su "${TESTUSER:-build}" -c "sh -e $0" fi diff --git a/.ci/lib/check_changed_versions.py b/.ci/lib/check_changed_versions.py index 2fc3f763d..062573f29 100755 --- a/.ci/lib/check_changed_versions.py +++ b/.ci/lib/check_changed_versions.py @@ -24,7 +24,7 @@ def get_package_contents(package, revision, check=True): if not check: stderr = subprocess.DEVNULL - # Run something like "git show upstream/master:main/hello-world/APKBUILD" + # Run something like "git show upstream/main:main/hello-world/APKBUILD" pmaports_dir = common.get_pmaports_dir() pattern = pmaports_dir + "/**/" + package + "/APKBUILD" path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):] diff --git a/.ci/lib/check_devices_in_wiki.py b/.ci/lib/check_devices_in_wiki.py index d1ba7ff29..ee81e1149 100755 --- a/.ci/lib/check_devices_in_wiki.py +++ b/.ci/lib/check_devices_in_wiki.py @@ -90,7 +90,7 @@ def main() -> int: parser = argparse.ArgumentParser() parser.add_argument("--booting", help="devices must be in the upper table," " being in the 'not booting' table below is not" - " enough (all devices in pmaports master and stable" + " enough (all devices in pmaports main and stable" " branches and should be in the upper table)", action="store_true") parser.add_argument("--path", help="instead of downloading the devices" diff --git a/.ci/lib/common.py b/.ci/lib/common.py index 8cd2f0dab..d26a13eca 100755 --- a/.ci/lib/common.py +++ b/.ci/lib/common.py @@ -48,7 +48,7 @@ def run_pmbootstrap(parameters): @cache def get_upstream_branch(): """ Use pmaports.cfg from current branch (e.g. "v20.05_fix-ci") and - channels.cfg from master to retrieve the upstream branch. + channels.cfg from main to retrieve the upstream branch. :returns: branch name, e.g. "v20.05" """ @@ -65,7 +65,7 @@ def get_upstream_branch(): # Get branch_pmaports (e.g. "v20.05") from channels.cfg # https://postmarketos.org/channels.cfg - channels_cfg_str = run_git(["show", "upstream/master:channels.cfg"]) + channels_cfg_str = run_git(["show", "upstream/main:channels.cfg"]) channels_cfg = configparser.ConfigParser() channels_cfg.read_string(channels_cfg_str) assert channel in channels_cfg, \