From cdca340d9177c00fc8cdb49cdd7cfbc67d148772 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 25 May 2020 15:18:14 -0700 Subject: [PATCH] (+semver: fix) Fix version argument --- .github/workflows/build.yml | 2 ++ makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 80f31f4..cbcec2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,6 +53,8 @@ jobs: - name: build run: make package + env: + VERSION: ${{ steps.gogitver.outputs.version }} - uses: actions/upload-release-asset@v1.0.1 env: diff --git a/makefile b/makefile index 8a1793d..6c77889 100644 --- a/makefile +++ b/makefile @@ -3,7 +3,7 @@ LINUX_BUILD_PATH = $(BUILD_PATH)/linux/gva LINUX_ARM_BUILD_PATH = $(BUILD_PATH)/arm/gva WINDOWS_BUILD_PATH = $(BUILD_PATH)/windows/gva.exe MAC_BUILD_PATH = $(BUILD_PATH)/darwin/gva -VERSION:=$(shell gogitver) +VERSION?=$(shell gogitver) COMMIT_HASH:=$(shell git rev-parse HEAD) BUILD_DATE:=$(shell date +%Y-%m-%dT%T%z) BUILD_FLAGS:=\