mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 15:23:14 -05:00
[CI] name the test release after the latest v*-dev tag
Also ignore the *-test tags when figuring out the Forgejo version, they exist in the integration repository and experimental repository for daily releases.
This commit is contained in:
parent
6531d765a0
commit
2762dd9597
3 changed files with 4 additions and 4 deletions
|
@ -110,7 +110,7 @@ jobs:
|
|||
#
|
||||
# Push a commit to a branch that triggers the build of a test release
|
||||
#
|
||||
version=0.0-test
|
||||
version=1.2-test
|
||||
(
|
||||
git clone $url/root/forgejo /tmp/forgejo
|
||||
cd /tmp/forgejo
|
||||
|
|
|
@ -54,7 +54,7 @@ jobs:
|
|||
ref="${{ github.ref }}"
|
||||
if [[ $ref =~ ^refs/heads/ ]] ; then
|
||||
if test "$ref" = "refs/heads/forgejo" ; then
|
||||
version=0.0-test
|
||||
version=$(git tag -l --sort=version:refname --merged | grep -v -e '-test$' | tail -1 | sed -E -e 's/^(v[0-9]+\.[0-9]+).*/\1/')-test
|
||||
else
|
||||
version=${ref#refs/heads/}
|
||||
version=${version%/forgejo}-test
|
||||
|
@ -70,7 +70,7 @@ jobs:
|
|||
exit 1
|
||||
fi
|
||||
version=${version#v}
|
||||
git describe --tags --always
|
||||
git describe --exclude '*-test' --tags --always
|
||||
echo "sha=${{ github.sha }}" >> "$GITHUB_OUTPUT"
|
||||
echo "version=$version" >> "$GITHUB_OUTPUT"
|
||||
echo "override=$override" >> "$GITHUB_OUTPUT"
|
||||
|
|
2
Makefile
2
Makefile
|
@ -90,7 +90,7 @@ STORED_VERSION=$(shell cat $(STORED_VERSION_FILE) 2>/dev/null)
|
|||
ifneq ($(STORED_VERSION),)
|
||||
FORGEJO_VERSION ?= $(STORED_VERSION)
|
||||
else
|
||||
FORGEJO_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
|
||||
FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always | sed 's/-/+/' | sed 's/^v//')
|
||||
endif
|
||||
RELEASE_VERSION ?= ${FORGEJO_VERSION}
|
||||
VERSION ?= ${RELEASE_VERSION}
|
||||
|
|
Loading…
Reference in a new issue