Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CI: Adapt to new pmbootstrap arch checking API

Browse source 
See https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/merge_requests/3004

Signed-off-by: Stefan Hansson <newbyte@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/9104>
This commit is contained in:
Stefan Hansson 2026-07-21 20:27:54 +02:00 • committed by The Friendly Meow (merge) Bot
parent 1c434e271d
commit a9897a91e2
No known key found for this signature in database
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
.ci/lib/build_changed_aports.py
View file

@ -13,10 +13,11 @@ import pmb.core
import pmb.parse
import pmb.parse._apkbuild
import pmb.helpers.pmaports
from pmb.core.arch import Arch
from pmb.core.context import get_context
def build_strict(packages, arch):
def build_strict(packages, arch: Arch):
common.run_pmbootstrap(["build_init"])
# We set the timeout to 1 hour because linking the Linux kernel with
# ThinLTO on our aarch64 runners takes slightly over 30 minutes
@ -24,7 +25,7 @@ def build_strict(packages, arch):
"--timeout", "3600",
"build",
"--strict", "--force",
"--arch", arch, ] + list(packages))
"--arch", str(arch), ] + list(packages))
if __name__ == "__main__":
@ -32,7 +33,7 @@ if __name__ == "__main__":
if len(sys.argv) != 2:
print("usage: build_changed_aports.py ARCH")
sys.exit(1)
arch = sys.argv[1]
arch = Arch(sys.argv[1])
# Get and print modified packages
packages = common.get_changed_packages(skip_archived=True)
@ -68,7 +69,7 @@ if __name__ == "__main__":
apkbuild_path = pmb.helpers.pmaports.find(package)
apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
if arch not in Arch.from_arch_field(apkbuild["arch"]):
print(f"{package}: not enabled for {arch}, skipping")
packages.remove(package)
@ -93,7 +94,7 @@ if __name__ == "__main__":
for package in systemd_pkgs.copy():
apkbuild_path = pmb.helpers.pmaports.find(package, True, True, with_extra_repos="enabled")
apkbuild = pmb.parse._apkbuild.apkbuild(pathlib.Path(apkbuild_path, "APKBUILD"))
if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
if arch not in Arch.from_arch_field(apkbuild["arch"]):
print(f"(extra-repos/systemd) {package}: not enabled for {arch}, skipping")
systemd_pkgs.remove(package)

6
.ci/testcases/test_ui.py
View file

@ -6,6 +6,7 @@ from pathlib import Path
import common
import pmb.parse
from pmb.core.arch import Arch
def test_aports_ui():
@ -13,8 +14,9 @@ def test_aports_ui():
Raise an error if package in _pmb_recommends is not found
"""
pmaports_cfg = pmb.config.pmaports.read_config()
for arch in pmaports_cfg["supported_arches"].split(","):
for arch_string in pmaports_cfg["supported_arches"].split(","):
for path in common.get_changed_files():
arch = Arch(arch_string)
path = Path(path)
if path.name != "APKBUILD":
@ -24,7 +26,7 @@ def test_aports_ui():
apkbuild = pmb.parse.apkbuild(path)
# Skip if arch isn't enabled
if not pmb.helpers.pmaports.check_arches(apkbuild["arch"], arch):
if arch not in Arch.from_arch_field(apkbuild["arch"]):
continue
for package in apkbuild["_pmb_recommends"]: