better testing experience

matryer · Mar 11, 2021 · 4905e00 · 4905e00
1 parent 871a58c
commit 4905e00
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ app/.DS_Store
 xbarapp.com/public/.DS_Store
 app/assets/mac/info.plist
 tools/sitegen/.version
+app/.version
diff --git a/app/main.go b/app/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	_ "embed"
 	"fmt"
 	"os"
 
@@ -10,8 +11,8 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/options/mac"
 )
 
-// version is the xbar version (set by the git tag in build.sh).
-var version string = "dev"
+//go:embed .version
+var version string
 
 func main() {
 	println("xbar", version)

diff --git a/app/package.sh b/app/package.sh
@@ -12,6 +12,7 @@ VERSION=`git describe --tags`
 echo ""
 echo "  xbar ${VERSION}..."
 echo ""
+echo -n $VERSION > .version
 
 # run all tests
 ./test.sh

diff --git a/app/test.sh b/app/test.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+VERSION=`git describe --tags`
+
 go test
 
 cd ../pkg/metadata
@@ -17,6 +19,7 @@ go test
 cd ../../app
 
 cd ../tools/sitegen
+echo -n $VERSION > .version
 go test -short
 cd ../../app