From 95908326b5410a86df082bf80fb893a1d22656d8 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Sat, 17 Aug 2024 16:37:04 +0200 Subject: [PATCH] ci: final round of APK CI fixes Using -ne wasn't such a good idea since it would do a numeric compare. Now use -n which checks if the length is non-zero. APK prints the problematic version if - problematic - so this should now do the trick. Signed-off-by: Paul Spooren --- .github/workflows/check-apk-valid-version.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-apk-valid-version.yml b/.github/workflows/check-apk-valid-version.yml index c16ca9cce0..def88c8648 100644 --- a/.github/workflows/check-apk-valid-version.yml +++ b/.github/workflows/check-apk-valid-version.yml @@ -6,7 +6,7 @@ on: jobs: build: - name: Check autorelease deprecation + name: Check APK compatible version/release runs-on: ubuntu-latest strategy: fail-fast: false @@ -48,15 +48,15 @@ jobs: PKG_RELEASE=$(grep -E '^PKG_RELEASE' "$ROOT/Makefile" | cut -f 2 -d '=') if [ -n "$PKG_RELEASE" ]; then if [[ "$PKG_RELEASE" == '^[0-9]+$' ]]; then - echo "PKG_RELEASE is not an integer" + echo "PKG_RELEASE is not an integer: $PKG_RELEASE" INCOMPATIBLE_VERSION+=" $ROOT" break fi fi PKG_VERSION=$(grep -E '^PKG_VERSION' "$ROOT/Makefile" | cut -f 2 -d '=') if [ -n "$PKG_VERSION" ]; then - if [[ $($GITHUB_WORKSPACE/apk version --check "$PKG_VERSION") -ne "" ]]; then - echo "PKG_VERSION is not compatible" + if [[ -n $($GITHUB_WORKSPACE/apk version --check "$PKG_VERSION") ]]; then + echo "PKG_VERSION is not compatible: $PKG_VERSION" INCOMPATIBLE_VERSION+=" $ROOT" fi fi -- 2.30.2