From cedd5331e5f38ca09eb180b8358644e9cdbb502a Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 28 Aug 2020 12:21:02 +0200 Subject: [PATCH] CI: test_aports_ui: don't take arches from binary (MR 1508) Verify _pmb_recommends for architectures listed in the APKBUILD of postmarketos-ui-* packages, not from their binary packages. Otherwise disabling an architecture in a merge request will not be respected, as the binary package still has the arch enabled. --- .gitlab-ci/testcases/test_aports.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/testcases/test_aports.py b/.gitlab-ci/testcases/test_aports.py index deb1e59bc..2a6604474 100644 --- a/.gitlab-ci/testcases/test_aports.py +++ b/.gitlab-ci/testcases/test_aports.py @@ -184,7 +184,7 @@ def test_aports_ui(args): for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"): apkbuild = pmb.parse.apkbuild(args, path) # Skip if arch isn't enabled - if not pmb.helpers.package.check_arch(args, apkbuild["pkgname"], arch): + if not pmb.helpers.package.check_arch(args, apkbuild["pkgname"], arch, False): continue for package in apkbuild["_pmb_recommends"]: