Merge pull request #143 from kuskoman/fix-version-in-makefile

Fix version parameter in binaries from CI
kuskoman · Jun 17, 2023 · 595964d · 595964d
2 parents 12b9aba + a752045
commit 595964d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/go-application.yml b/.github/workflows/go-application.yml
@@ -151,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
@@ -174,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
@@ -197,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"