Change approach of fixing version argument

xonvanetta · Jun 17, 2023 · a752045 · a752045
1 parent 3cf43f1
commit a752045
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/go-application.yml b/.github/workflows/go-application.yml
@@ -143,8 +143,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Required for git symbolic-ref to work
 
       - name: Setup Golang with cache
         uses: magnetikonline/action-golang-cache@v4
@@ -153,6 +151,8 @@ jobs:
 
       - name: Build Linux binary
         run: make build-linux
+        env:
+          VERSION: ${{ github.ref }}
 
       - name: Upload Linux binary
         uses: actions/upload-artifact@v3
@@ -168,8 +168,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Required for git symbolic-ref to work
 
       - name: Setup Golang with cache
         uses: magnetikonline/action-golang-cache@v4
@@ -178,6 +176,8 @@ jobs:
 
       - name: Build Mac binary
         run: make build-darwin
+        env:
+          VERSION: ${{ github.ref }}
 
       - name: Upload Mac binary
         uses: actions/upload-artifact@v3
@@ -193,8 +193,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Required for git symbolic-ref to work
 
       - name: Setup Golang with cache
         uses: magnetikonline/action-golang-cache@v4
@@ -203,6 +201,8 @@ jobs:
 
       - name: Build Windows binary
         run: make build-windows
+        env:
+          VERSION: ${{ github.ref }}
 
       - name: Upload Windows binary
         uses: actions/upload-artifact@v3

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ GOOS_BINARIES := $(foreach goos,$(GOOS_VALUES),out/main-$(goos))
 GOOS_EXES := $(foreach goos,$(GOOS_VALUES),$(if $(filter windows,$(goos)),out/main-$(goos),out/main-$(goos)))
 
 GITHUB_REPO := github.com/kuskoman/logstash-exporter
-VERSION := $(shell git symbolic-ref --short HEAD)
+VERSION ?= $(shell git symbolic-ref --short HEAD)
 GIT_COMMIT := $(shell git rev-parse HEAD)
 DOCKER_IMG ?= "logstash-exporter"