ci: adjust git tags filtering

Another attempt at fixing logic for version detection in COPR.

diff --git a/ci/Makefile.dist-packaging b/ci/Makefile.dist-packaging
index de77be6cbba139fe7595ae60150bfac3927177a2..6bbe5fe99179d0013a2cf6308f6b92cb4c0e2e15 100644 (file)
--- a/ci/Makefile.dist-packaging
+++ b/ci/Makefile.dist-packaging
@@ -2,7 +2,7 @@
 
 mypath = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 topsrcdir = $(shell git rev-parse --show-toplevel)
-GITREV = $(shell git describe --always --tags)
+GITREV = $(shell git describe --always --tags --match 'v2???.*')
 GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,')
 
 PACKAGE ?= $(shell basename $(topsrcdir))

diff --git a/ci/make-git-snapshot.sh b/ci/make-git-snapshot.sh
index acfdd6c259e969b0bdb5c23266d7ff6ba13b1e9c..22f65a50d77445794d83198725484ab1fb5058e7 100755 (executable)
--- a/ci/make-git-snapshot.sh
+++ b/ci/make-git-snapshot.sh
@@ -3,7 +3,7 @@ set -xeuo pipefail
 
 TOP=$(git rev-parse --show-toplevel)
 GITREV=$(git rev-parse HEAD)
-gitdescribe=$(git describe --always --tags $GITREV)
+gitdescribe=$(git describe --always --tags --match 'v2???.*' $GITREV)
 version=$(echo "$gitdescribe" | sed -e 's,-,\.,g' -e 's,^v,,')
 name=libostree
 PKG_VER="${name}-${version}"