Update README.md

re-enable release binaries

.gitea/workflows/pull-request-ci.yaml

@@ -5,8 +5,6 @@ on:
 jobs:
   lint:
     name: Lint
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -19,6 +17,11 @@ jobs:
           check-latest: true
           cache: true
 
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
       - name: Install go dependencies
         run: go mod tidy
 
@@ -29,8 +32,6 @@ jobs:
 
   test:
     name: Test
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -61,8 +62,6 @@ jobs:
 
   build:
     name: Build
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -90,8 +89,7 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
+          fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}-${BUILD}-${GOOS}-${GOARCH}
-          mv *.tar.xz bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64.tar.xz
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -103,7 +101,7 @@ jobs:
 
       - name: Build for windows
         run: |
-          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
+          fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}-${BUILD}-${GOOS}-${GOARCH}.exe
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -116,5 +114,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: swiped-mod-switcher-${{github.ref_name}}
+          name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
           path: bin/

.gitea/workflows/push-ci.yaml

@@ -6,13 +6,14 @@ on:
 jobs:
   lint:
     name: Lint
-    env:
-      RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: test log
+        run: env | sort
+
       - name: Setup go
         uses: actions/setup-go@v5
         with:
@@ -20,6 +21,11 @@ jobs:
           check-latest: true
           cache: true
 
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
       - name: Install go dependencies
         run: go mod tidy
 
@@ -30,8 +36,6 @@ jobs:
 
   test:
     name: Test
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -62,8 +66,6 @@ jobs:
 
   build:
     name: Build
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -91,7 +93,7 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne build --os=${{GOOS}} --metadata Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/sw1ped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}} main.go
+          fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}-${BUILD}-${GOOS}-${GOARCH}
           ls bin
         env:
           VERSION: ${{github.ref_name}}
@@ -103,7 +105,7 @@ jobs:
 
       - name: Build for windows
         run: |
-          fyne build --os=${{GOOS}} --metadata Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/sw1ped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}}.exe main.go
+          fyne build --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION}-${BUILD}-${GOOS}-${GOARCH}.exe
           ls bin
         env:
           VERSION: ${{github.ref_name}}
@@ -116,5 +118,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: swiped-mod-switcher-${{github.ref_name}}
+          name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
           path: bin/

.gitea/workflows/tag-release.yaml

@@ -7,8 +7,6 @@ on:
 jobs:
   lint:
     name: Lint
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -21,6 +19,11 @@ jobs:
           check-latest: true
           cache: true
 
+      - name: Setup OS dependencies
+        run: |
+          apt-get update
+          apt-get install -y gcc-mingw-w64 gcc libgl1-mesa-dev xorg-dev
+
       - name: Install go dependencies
         run: go mod tidy
 
@@ -31,8 +34,6 @@ jobs:
 
   test:
     name: Test
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -87,8 +88,7 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
+          fyne build --release --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}-${BUILD}-${GOOS}-${GOARCH}
-          mv *.tar.xz bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64.tar.xz
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -100,7 +100,7 @@ jobs:
 
       - name: Build for windows
         run: |
-          fyne package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
+          fyne build --release --os=${GOOS} --metadata BuildVersion=${VERSION} --metadata BuildNumber=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}-${BUILD}-${GOOS}-${GOARCH}.exe
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -110,6 +110,12 @@ jobs:
           CGO_ENABLED: 1
           CC: x86_64-w64-mingw32-gcc
 
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: swiped-mod-switcher-${{github.ref_name}}-${{github.run_number}}
+          path: bin/
+
       - name: Release binaries
         uses: https://gitea.com/actions/release-action@main
         with:

FyneApp.toml

@@ -2,5 +2,3 @@
   Icon = "icon.png"
   Name = "Swiped Mod Switcher"
   ID = "com.s1d3sw1ped.swipedmodswitcher"
-  Version = "0.0.0"
-  Build = 2

README.md

@@ -1,5 +1,5 @@
 # Swiped Mod Switcher
-A simple but effective mod switcher for simple game such as Sims and Cyberpunk 2077.
+A simple but effective mod switcher for simple game such as Sims.
 
 it works by switching out a games mod folder with one of the ones made by you and placed under the profiles directory.
 

main.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime/debug"
 	"s1d3sw1ped/swipedmodswitcher/admin"
 	"slices"
-	"strconv"
 	"strings"
 
 	"fyne.io/fyne/v2"
@@ -18,8 +18,6 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-var Version = ""
-
 type Config struct {
 	ModProfilesDirectory string `yaml:"mod_profiles_dir"`
 	GameModsDirectory    string `yaml:"game_mods_dir"`
@@ -74,7 +72,31 @@ func main() {
 	cfg = loadConfig()
 
 	ap := app.New()
-	wp := ap.NewWindow(ap.Metadata().Name + " v" + ap.Metadata().Version + "." + strconv.Itoa(ap.Metadata().Build))
+
+	commithash := func() string {
+		if info, ok := debug.ReadBuildInfo(); ok {
+			for _, setting := range info.Settings {
+				if setting.Key == "vcs.revision" {
+					return setting.Value
+				}
+			}
+		}
+		return ""
+	}()
+
+	buildversion := ap.Metadata().Custom["BuildVersion"]
+	if buildversion == "" {
+		buildversion = ""
+	}
+
+	buildnumber := ap.Metadata().Custom["BuildNumber"]
+	if buildnumber == "" {
+		buildnumber = "commit " + commithash
+	} else {
+		buildnumber = "build " + buildnumber
+	}
+
+	wp := ap.NewWindow(ap.Metadata().Name + " " + buildversion + " " + buildnumber)
 	wp.Resize(fyne.NewSize(600, 1))
 	wp.CenterOnScreen()
 
@@ -189,6 +211,6 @@ func makeIFunc(profile, archive string, parent fyne.Window) func() {
 			return
 		}
 
-		dialog.NewInformation("Success", fmt.Sprintf("filinked files from %s to %s", filepath.Base(profile), archive), parent).Show()
+		dialog.NewInformation("Success", fmt.Sprintf("linked files from %s to %s", filepath.Base(profile), archive), parent).Show()
 	}
 }