self-hosted/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-12-24 10:07:21 +02:00
Code Issues Releases Activity

Refactor version handling in Makefile (#2320)

Browse Source
This commit is contained in:
6543 2023-08-23 06:53:40 +02:00 committed by GitHub
parent 61b5672051
commit c973099c99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -14,20 +14,20 @@ CI_COMMIT_SHA ?= $(shell git rev-parse HEAD)
# it's a tagged release # it's a tagged release
ifneq ($(CI_COMMIT_TAG),) ifneq ($(CI_COMMIT_TAG),)
BUILD_VERSION := $(CI_COMMIT_TAG:v%=%) VERSION := $(CI_COMMIT_TAG:v%=%)
VERSION_NUMBER := ${CI_COMMIT_TAG:v%=%} VERSION_NUMBER := ${CI_COMMIT_TAG:v%=%}
else else
# append commit-sha to next version # append commit-sha to next version
ifeq ($(VERSION),next) ifeq ($(VERSION),next)
BUILD_VERSION := $(shell echo "next-$(shell echo ${CI_COMMIT_SHA} | cut -c -10)") VERSION := $(shell echo "next-$(shell echo ${CI_COMMIT_SHA} | cut -c -10)")
endif endif
# append commit-sha to release branch version # append commit-sha to release branch version
ifeq ($(shell echo ${CI_COMMIT_BRANCH} | cut -c -9),release/v) 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)") VERSION := $(shell echo "$(shell echo ${CI_COMMIT_BRANCH} | cut -c 10-)-$(shell echo ${CI_COMMIT_SHA} | cut -c -10)")
endif 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=${VERSION}
CGO_ENABLED ?= 1 # only used to compile server CGO_ENABLED ?= 1 # only used to compile server
HAS_GO = $(shell hash go > /dev/null 2>&1 && echo "GO" || echo "NOGO" ) HAS_GO = $(shell hash go > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
@ -50,7 +50,6 @@ ifeq (in_docker,$(firstword $(MAKECMDGOALS)))
@docker run -it \ @docker run -it \
--user $(shell id -u):$(shell id -g) \ --user $(shell id -u):$(shell id -g) \
-e VERSION="$(VERSION)" \ -e VERSION="$(VERSION)" \
-e BUILD_VERSION="$(BUILD_VERSION)" \
-e CI_COMMIT_SHA="$(CI_COMMIT_SHA)" \ -e CI_COMMIT_SHA="$(CI_COMMIT_SHA)" \
-e TARGETOS="$(TARGETOS)" \ -e TARGETOS="$(TARGETOS)" \
-e TARGETARCH="$(TARGETARCH)" \ -e TARGETARCH="$(TARGETARCH)" \
@ -68,7 +67,7 @@ all: help
.PHONY: version .PHONY: version
version: ## Print the current version version: ## Print the current version
@echo ${BUILD_VERSION} @echo ${VERSION}
# The help target prints out all targets with their descriptions organized # The help target prints out all targets with their descriptions organized
# beneath their categories. The categories are represented by '##@' and the # beneath their categories. The categories are represented by '##@' and the