From acfa952b51e585c0bdcd8e041451c375bb3ef324 Mon Sep 17 00:00:00 2001 From: iwilltry42 Date: Wed, 17 Jun 2020 20:05:01 +0200 Subject: [PATCH] CI/drone: use DRONE_TAG --- .drone.yml | 2 ++ Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7b63cc9d..61a87599 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,6 +37,8 @@ steps: - name: build image: golang:1.14 + environment: + GIT_TAG: ${DRONE_TAG} commands: - make ci-setup - make build-cross diff --git a/Makefile b/Makefile index 29a81976..37dfb147 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ export GO111MODULE=on ########## Tags ########## # get git tag -GIT_TAG := $(shell git describe --tags) +GIT_TAG ?= $(shell git describe --tags) ifeq ($(GIT_TAG),) GIT_TAG := $(shell git describe --always) endif