]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
ci: support tagged version matching in obs:build:all
authorTomas Krizek <tomas.krizek@nic.cz>
Thu, 27 Jun 2019 11:43:17 +0000 (13:43 +0200)
committerTomas Krizek <tomas.krizek@nic.cz>
Thu, 27 Jun 2019 15:15:12 +0000 (17:15 +0200)
.gitlab-ci.yml

index a2b6d789d4b8d43af668c9f8fd50aebb5bf7e5ae..dea89b009af4af4ffc649bd36cd0da8572297021 100644 (file)
@@ -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 | \