mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CI/drone: use DRONE_TAG

Browse Source
This commit is contained in:
iwilltry42 2020-06-17 20:05:01 +02:00
parent 32b7934f14
commit acfa952b51
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@ -37,6 +37,8 @@ steps:
- name: build - name: build
image: golang:1.14 image: golang:1.14
environment:
GIT_TAG: ${DRONE_TAG}
commands: commands:
- make ci-setup - make ci-setup
- make build-cross - make build-cross

2
Makefile
View File

@ -16,7 +16,7 @@ export GO111MODULE=on
########## Tags ########## ########## Tags ##########
# get git tag # get git tag
GIT_TAG := $(shell git describe --tags) GIT_TAG ?= $(shell git describe --tags)
ifeq ($(GIT_TAG),) ifeq ($(GIT_TAG),)
GIT_TAG := $(shell git describe --always) GIT_TAG := $(shell git describe --always)
endif endif