mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-11-29 21:31:02 +00:00
Set correct version for release branch releases (#2227)
close #2225 also make the sha 10 chars long instead of 8, to match the docker tags
This commit is contained in:
parent
c1731524bc
commit
8d19d3b8ff
1 changed files with 14 additions and 9 deletions
23
Makefile
23
Makefile
|
@ -10,16 +10,21 @@ endif
|
||||||
|
|
||||||
VERSION ?= next
|
VERSION ?= next
|
||||||
VERSION_NUMBER ?= 0.0.0
|
VERSION_NUMBER ?= 0.0.0
|
||||||
ifneq ($(CI_COMMIT_TAG),)
|
|
||||||
VERSION := $(CI_COMMIT_TAG:v%=%)
|
|
||||||
VERSION_NUMBER := ${VERSION}
|
|
||||||
endif
|
|
||||||
|
|
||||||
# append commit-sha to next version
|
|
||||||
BUILD_VERSION ?= $(VERSION)
|
|
||||||
ifeq ($(BUILD_VERSION),next)
|
|
||||||
CI_COMMIT_SHA ?= $(shell git rev-parse HEAD)
|
CI_COMMIT_SHA ?= $(shell git rev-parse HEAD)
|
||||||
BUILD_VERSION := $(shell echo "next-$(shell echo ${CI_COMMIT_SHA} | head -c 8)")
|
|
||||||
|
# it's a tagged release
|
||||||
|
ifneq ($(CI_COMMIT_TAG),)
|
||||||
|
BUILD_VERSION := $(CI_COMMIT_TAG:v%=%)
|
||||||
|
VERSION_NUMBER := ${VERSION}
|
||||||
|
else
|
||||||
|
# append commit-sha to next version
|
||||||
|
ifeq ($(VERSION),next)
|
||||||
|
BUILD_VERSION := $(shell echo "next-$(shell echo ${CI_COMMIT_SHA} | cut -c -10)")
|
||||||
|
endif
|
||||||
|
# append commit-sha to release branch version
|
||||||
|
ifeq ($(shell echo ${CI_COMMIT_BRANCH} | cut -c -9),release/v)
|
||||||
|
BUILD_VERSION := $(shell echo "$(shell echo ${CI_COMMIT_BRANCH} | cut -c 10-)-$(shell echo ${CI_COMMIT_SHA} | cut -c -10)")
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LDFLAGS := -s -w -extldflags "-static" -X github.com/woodpecker-ci/woodpecker/version.Version=${BUILD_VERSION}
|
LDFLAGS := -s -w -extldflags "-static" -X github.com/woodpecker-ci/woodpecker/version.Version=${BUILD_VERSION}
|
||||||
|
|
Loading…
Reference in a new issue