From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 27 Jun 2019 11:43:17 +0000 (+0200)
Subject: ci: support tagged version matching in obs:build:all
X-Git-Tag: v4.1.0~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1a268afa69ace64c8d2cdd9af6fc2acaac2d41b;p=thirdparty%2Fknot-resolver.git

ci: support tagged version matching in obs:build:all
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2b6d789d..dea89b009 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -508,9 +508,10 @@ obs:build:all:
   <<: *deploytest
   script:
     - "osc results home:CZ-NIC:$OBS_REPO knot-resolver -w"
+    - version=$(sed 's/^v//' <(git describe --exact-match HEAD || git rev-parse --short HEAD) )
     - > # check version only for one (reliable) repo to avoid false negatives
       ! osc ls -b home:CZ-NIC:$OBS_REPO knot-resolver Debian_9.0 x86_64 | \
-        grep -E '(rpm|deb|tar\.xz)$' | grep -v $CI_COMMIT_SHORT_SHA || \
+        grep -E '(rpm|deb|tar\.xz)$' | grep -v $version || \
         (echo "ERROR: version mismatch"; exit 1)
     - >
       ! osc results home:CZ-NIC:$OBS_REPO knot-resolver --csv | \