Now define aisap-go version in build.zig.zon

mgord9518 · Oct 2, 2023 · ffb73c1 · ffb73c1
1 parent 5ceab20
commit ffb73c1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/appimage.go b/appimage.go
@@ -49,8 +49,11 @@ type AppImage struct {
 }
 
 // Current version of aisap
-const (
-	Version = "0.9.7-alpha"
+// Defined in `zig/build.zig.zon`
+// When using aisap as a library, `--ldflags="-X github.com/mgord9518/aisap.Version=[VERSION HERE]"`
+// should be updated to the value contained in build.zig.zon
+var (
+	Version = "UNDEFINED"
 )
 
 // Create a new AppImage object from a path

diff --git a/resources/build.sh b/resources/build.sh
@@ -3,6 +3,7 @@
 
 [ -z "$ARCH" ] && ARCH=$(uname -m)
 PATH="$PATH:$HOME/.local/bin"
+export VERSION=$(cat zig/build.zig.zon | grep '.version' | cut -d'"' -f2)
 
 if [ ! $(command -v 'go') ]; then
 	echo 'Failed to locate GoLang compiler! Unable to build'
@@ -31,7 +32,10 @@ replace github.com/mgord9518/aisap/helpers => ../../helpers
 ' >> go.mod
 go mod tidy
 
-CGO_ENABLED=0 go build -ldflags '-s -w' -o '../../AppDir/usr/bin'
+CGO_ENABLED=0 go build \
+    -o '../../AppDir/usr/bin' \
+    --ldflags="-sw -X github.com/mgord9518/aisap.Version=$VERSION"
+
 [ $? -ne 0 ] && exit $?
 cd ../..
 
@@ -69,7 +73,6 @@ ln -s './usr/bin/aisap' 'AppDir/AppRun'
 
 # Build the AppImage
 export ARCH="$ARCH"
-export VERSION=$('AppDir/usr/bin/aisap' --version)
 
 # Set arch
 sed -i 's/X-AppImage-Architecture.*/X-AppImage-Architecture=x86_64/' 'AppDir/io.github.mgord9518.aisap.desktop'

diff --git a/zig/build.zig.zon b/zig/build.zig.zon
@@ -1,4 +1,4 @@
 .{
     .name = "aisap",
-    .version = "0.9.7-alpha",
+    .version = "0.9.8-alpha",
 }