From bec46b53114ce1375af08fa0d1e8c709c073d2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Mon, 10 Aug 2026 13:10:42 +0200 Subject: [PATCH] ci: simplify logic in check_changed_versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pablo Correa Gómez Part-of: --- .ci/lib/check_changed_versions.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.ci/lib/check_changed_versions.py b/.ci/lib/check_changed_versions.py index 2534582a2..056027a84 100755 --- a/.ci/lib/check_changed_versions.py +++ b/.ci/lib/check_changed_versions.py @@ -130,20 +130,18 @@ def check_versions(packages): print(f"- {package}: {head} (HEAD) (new package)") continue - # Check pkgver follows expected format for device packages - pkgver = head.rpartition('-r')[0] is_device_pkg = os.path.basename(package).startswith('device-') - if is_device_pkg and not pkgver.isdigit(): - print(f" - {package}: invalid pkgver \"{pkgver}\"" - "See: https://docs.postmarketos.org/pmaports/main/packaging-guidelines.html#package-versioning-pkgver-pkgrel") - error = True - - # Additional checks for device packages if is_device_pkg: - head_parsed = get_package_contents(package, "HEAD", False) - upstream_parsed = get_package_contents(package, commit, False) + # Check pkgver follows expected format for device packages + pkgver = head.rpartition('-r')[0] + if not pkgver.isdigit(): + print(f" - {package}: invalid pkgver \"{pkgver}\"" + "See: https://docs.postmarketos.org/pmaports/main/packaging-guidelines.html#package-versioning-pkgver-pkgrel") + error = True # Check that pkgrel was reset to 0 when pkgver was changed + head_parsed = get_package_contents(package, "HEAD", False) + upstream_parsed = get_package_contents(package, commit, False) if head_parsed["pkgver"] != upstream_parsed["pkgver"] and head_parsed["pkgrel"] != "0": print(f" - {package}: pkgrel should be 0 when pkgver changes." "See: https://docs.postmarketos.org/pmaports/main/packaging-guidelines.html#package-versioning-pkgver-pkgrel")