diff --git a/ci/Makefile.dist-packaging b/ci/Makefile.dist-packaging index de77be6c..6bbe5fe9 100644 --- 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 acfdd6c2..22f65a50 100755 --- 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}"