snlavaise/pmaports-rtwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: replace master strings with main

Browse Source 
Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8183>
This commit is contained in:
Aster Boese
2026-03-15 17:47:40 +00:00
committed by The Friendly Meow (merge) Bot
parent 9ca92f0d6d
commit 5da1b74db0
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/build-docs.sh
+1 -1
View File
@@ -11,7 +11,7 @@
if [ "$(id -u)" = 0 ]; then if [ "$(id -u)" = 0 ]; then
set -x set -x
apk -q add py3-pip make git 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" exec su "${TESTUSER:-build}" -c "sh -e $0"
fi fi
.ci/dint.sh
+1 -1
View File
@@ -6,7 +6,7 @@
if [ "$(id -u)" = 0 ]; then if [ "$(id -u)" = 0 ]; then
set -x set -x
apk add git python3 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" exec su "${TESTUSER:-build}" -c "sh -e $0"
fi fi
.ci/lib/check_changed_versions.py
+1 -1
View File
@@ -24,7 +24,7 @@ def get_package_contents(package, revision, check=True):
if not check: if not check:
stderr = subprocess.DEVNULL 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() pmaports_dir = common.get_pmaports_dir()
pattern = pmaports_dir + "/**/" + package + "/APKBUILD" pattern = pmaports_dir + "/**/" + package + "/APKBUILD"
path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):] path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):]
.ci/lib/check_devices_in_wiki.py
+1 -1
View File
@@ -90,7 +90,7 @@ def main() -> int:
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--booting", help="devices must be in the upper table," parser.add_argument("--booting", help="devices must be in the upper table,"
" being in the 'not booting' table below is not" " 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)", " branches and should be in the upper table)",
action="store_true") action="store_true")
parser.add_argument("--path", help="instead of downloading the devices" parser.add_argument("--path", help="instead of downloading the devices"
.ci/lib/common.py
+2 -2
View File
@@ -48,7 +48,7 @@ def run_pmbootstrap(parameters):
@cache @cache
def get_upstream_branch(): def get_upstream_branch():
""" Use pmaports.cfg from current branch (e.g. "v20.05_fix-ci") and """ 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" """ :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 # Get branch_pmaports (e.g. "v20.05") from channels.cfg
# https://postmarketos.org/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 = configparser.ConfigParser()
channels_cfg.read_string(channels_cfg_str) channels_cfg.read_string(channels_cfg_str)
assert channel in channels_cfg, \ assert channel in channels_cfg, \