From: Paul Spooren <mail@aparcar.org>
Date: Fri, 18 Sep 2020 04:55:00 +0000 (-1000)
Subject: CI: pass only VERSION to test.sh
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4f4207be0c940eb4adadb52988edbf38deea39bc;p=feed%2Fpackages.git

CI: pass only VERSION to test.sh

Currently the passed VERSION includes the release, which is usually not
part of the compiled binary. Removing it simplifies the `grep` command
to check for correct package output during runtime tests.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/.github/workflows/entrypoint.sh b/.github/workflows/entrypoint.sh
index 21e9035d06..63ef09c27e 100755
--- a/.github/workflows/entrypoint.sh
+++ b/.github/workflows/entrypoint.sh
@@ -6,8 +6,10 @@ opkg update
 
 for PKG in /ci/*.ipk; do
 	tar -xzOf "$PKG" ./control.tar.gz | tar xzf - ./control 
+	# package name including variant
 	PKG_NAME=$(sed -ne 's#^Package: \(.*\)$#\1#p' ./control)
-	PKG_VERSION=$(sed -ne 's#^Version: \(.*\)$#\1#p' ./control)
+	# package version without release
+	PKG_VERSION=$(sed -ne 's#^Version: \(.*\)-[0-9]*$#\1#p' ./control)
 
 	echo "Testing package $PKG_NAME ($PKG_VERSION)"