packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2770 from lucab/ups/git-describe-tags 

ci: adjust git tags filtering
This commit is contained in:
Colin Walters 2022-11-21 11:33:10 -05:00 committed by GitHub
parent 13ceb3d531 4202082019
commit b8b07fc26b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/Makefile.dist-packaging
View File

@ -2,7 +2,7 @@
mypath = $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) mypath = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
topsrcdir = $(shell git rev-parse --show-toplevel) 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,,') GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,')
PACKAGE ?= $(shell basename $(topsrcdir)) PACKAGE ?= $(shell basename $(topsrcdir))

2
ci/make-git-snapshot.sh
View File

@ -3,7 +3,7 @@ set -xeuo pipefail
TOP=$(git rev-parse --show-toplevel) TOP=$(git rev-parse --show-toplevel)
GITREV=$(git rev-parse HEAD) 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,,') version=$(echo "$gitdescribe" | sed -e 's,-,\.,g' -e 's,^v,,')
name=libostree name=libostree
PKG_VER="${name}-${version}" PKG_VER="${name}-${version}"