fix issue with git tags and builds

reschke · Dec 9, 2020 · 9abe2d3 · 9abe2d3
1 parent 2d643f1
commit 9abe2d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: '0'
-
+
+    - name: Set env
+      run: echo "OCTORPKI_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
     - name: Build
       run: |
         GOOS=linux make build-octorpki

diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ BUILDINFOSDET ?=
 
 DOCKER_REPO   := cloudflare/
 OCTORPKI_NAME    := octorpki
-OCTORPKI_VERSION := $(shell git describe)
+OCTORPKI_VERSION ?= $(shell git describe)
 VERSION_PKG   := $(shell echo $(OCTORPKI_VERSION) | sed 's/^v//g')
 ARCH          := x86_64
 LICENSE       := BSD-3