derive version num from git tag

mackerelio · May 24, 2016 · 3d5ef98 · 3d5ef98
1 parent 7f263d6
commit 3d5ef98
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/build.bat b/build.bat
@@ -1,9 +1,15 @@
+echo on
+
 FOR /F "usebackq" %%w IN (`git rev-parse --short HEAD`) DO SET COMMIT=%%w
 
-FOR /F "usebackq" %%w IN (`git describe --tags --abbrev^=0`) DO SET VERSION=%%w
+FOR /F "usebackq" %%w IN (`git tag -l --sort=-version:refname "v*"`) DO (
+  IF NOT DEFINED VERSION (
+    SET VERSION=%%w
+  )
+)
 
 set VERSION=%VERSION:v=%
 
 echo %VERSION%
 
-go build -o build/mackerel-agent.exe -ldflags="-X github.com/mackerelio/mackerel-agent/version.GITCOMMIT %COMMIT% -X github.com/mackerelio/mackerel-agent/version.VERSION %VERSION% " github.com/mackerelio/mackerel-agent
+go build -o build/mackerel-agent.exe -ldflags="-X github.com/mackerelio/mackerel-agent/version.GITCOMMIT %COMMIT% -X github.com/mackerelio/mackerel-agent/version.VERSION %VERSION% " github.com/mackerelio/mackerel-agent
diff --git a/wix/build.bat b/wix/build.bat
@@ -15,7 +15,11 @@ go build -o ..\build\wrapper.exe wrapper\wrapper_windows.go
 go build -o ..\build\replace.exe replace\replace_windows.go
 
 REM retrieve numeric version from git tag
-FOR /F "usebackq" %%w IN (`git describe --tags --abbrev^=0`) DO SET VERSION=%%w
+FOR /F "usebackq" %%w IN (`git tag -l --sort=-version:refname "v*"`) DO (
+  IF NOT DEFINED VERSION (
+    SET VERSION=%%w
+  )
+)
 set VERSION=%VERSION:v=%
 FOR /F "tokens=1 delims=-+" %%w IN ('ECHO %%VERSION%%') DO SET VERSION=%%w
 IF "%VERSION%"=="staging" (