mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-08 18:04:14 +01:00
Merge pull request '[CI] FORGEJO_VERSION drop "g" prefix' (#2694) from oliverpool/forgejo:drop_g_prefix_from_version into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2694 Reviewed-by: Otto <otto@codeberg.org>
This commit is contained in:
commit
1b74f8a266
1 changed files with 2 additions and 1 deletions
3
Makefile
3
Makefile
|
@ -91,7 +91,8 @@ STORED_VERSION=$(shell cat $(STORED_VERSION_FILE) 2>/dev/null)
|
|||
ifneq ($(STORED_VERSION),)
|
||||
FORGEJO_VERSION ?= $(STORED_VERSION)
|
||||
else
|
||||
FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always | sed 's/^v//')+${GITEA_COMPATIBILITY}
|
||||
# drop the "g" prefix prepended by git describe to the commit hash
|
||||
FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always | sed 's/^v//' | sed 's/\-g/-/')+${GITEA_COMPATIBILITY}
|
||||
endif
|
||||
FORGEJO_VERSION_MAJOR=$(shell echo $(FORGEJO_VERSION) | sed -e 's/\..*//')
|
||||
|
||||
|
|
Loading…
Reference in a new issue