From 6f464f96bf38d5cbf5da5897513ba21fe0c1cf78 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sat, 30 Nov 2019 15:12:10 +0100 Subject: [PATCH] CI: skip git versions in framework check The framework check is supposed to make sure, that we always have the same versions of multiple packages that belong to the same framework. We must exclude git versions for this check to have it working properly. The interesting question is of course: why was this working before? The check is using the url field to figure out which packages belong to a certain framework, and by chance, all packages that had a git version, did also use single quotes around the URL: url='http://qt-project.org/' With the old APKINDEX parsing code, this was parsed as: url: "'http://qt-project.org/'" And therefore, this was considered a different URL than the URL with double quotes (again, by chance!) used by the stable qt versions: url: "http://qt-project.org/" I have improved the APKBUILD parsing code in pmbootstrap today, and now it is properly parsing both URLs. Related: https://gitlab.com/postmarketOS/pmbootstrap/merge_requests/1837 --- .gitlab-ci/testcases/test_aports_framework_versions.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci/testcases/test_aports_framework_versions.py b/.gitlab-ci/testcases/test_aports_framework_versions.py index 29db09e03..4e3e762e5 100644 --- a/.gitlab-ci/testcases/test_aports_framework_versions.py +++ b/.gitlab-ci/testcases/test_aports_framework_versions.py @@ -52,6 +52,9 @@ def get_categorized_packages(args): if pkgver == "9999": pkgver = apkbuild["_pkgver"] + if "_git" in pkgver: + continue + # Categorize by URL category = "other" if "https://www.kde.org/workspaces/plasmadesktop" in url: