mbiryukova/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Merge pull request #541 from smallstep/max/ver

Browse source 
VERSION from ENV should always take precedence over CI tags
This commit is contained in:
Max 2021-04-15 15:23:19 -07:00 committed by GitHub
commit b7f8f15619
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -38,7 +38,7 @@ bootstra%:
# If TRAVIS_TAG is set then we know this ref has been tagged. # If TRAVIS_TAG is set then we know this ref has been tagged.
ifdef TRAVIS_TAG ifdef TRAVIS_TAG
VERSION := $(TRAVIS_TAG) VERSION ?= $(TRAVIS_TAG)
NOT_RC := $(shell echo $(VERSION) | grep -v -e -rc) NOT_RC := $(shell echo $(VERSION) | grep -v -e -rc)
ifeq ($(NOT_RC),) ifeq ($(NOT_RC),)
PUSHTYPE := release-candidate PUSHTYPE := release-candidate
@ -47,7 +47,7 @@ PUSHTYPE := release
endif endif
# GITHUB Actions # GITHUB Actions
else ifdef GITHUB_REF else ifdef GITHUB_REF
VERSION := $(shell echo $(GITHUB_REF) | sed 's/^refs\/tags\///') VERSION ?= $(shell echo $(GITHUB_REF) | sed 's/^refs\/tags\///')
NOT_RC := $(shell echo $(VERSION) | grep -v -e -rc) NOT_RC := $(shell echo $(VERSION) | grep -v -e -rc)
ifeq ($(NOT_RC),) ifeq ($(NOT_RC),)
PUSHTYPE := release-candidate PUSHTYPE := release-candidate