From b04e6533501fa8838ab6f7be64552b2f5a91979d Mon Sep 17 00:00:00 2001
From: Justin Harms <s1d3sw1ped@gmail.com>
Date: Mon, 11 Mar 2024 23:39:24 -0500
Subject: [PATCH] blah

---
 .gitea/workflows/pull-request-ci.yaml |  5 ++---
 .gitea/workflows/push-ci.yaml         | 14 +++++++-------
 .gitea/workflows/tag-release.yaml     |  5 ++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/pull-request-ci.yaml b/.gitea/workflows/pull-request-ci.yaml
index c8e7dc2..8fe8959 100644
--- a/.gitea/workflows/pull-request-ci.yaml
+++ b/.gitea/workflows/pull-request-ci.yaml
@@ -90,8 +90,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
-          mv *.tar.xz bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64.tar.xz
+          fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -103,7 +102,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 Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml
index 7a8024b..89061e7 100644
--- a/.gitea/workflows/push-ci.yaml
+++ b/.gitea/workflows/push-ci.yaml
@@ -91,11 +91,11 @@ 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 Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
           ls bin
         env:
-          VERSION: ${{github.ref_name}}
-          BUILD: ${{github.run_number}}
+          VERSION: ${github.ref_name}
+          BUILD: ${github.run_number}
           GOOS: linux
           GOARCH: amd64
           CGO_ENABLED: 1
@@ -103,11 +103,11 @@ 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 Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
           ls bin
         env:
-          VERSION: ${{github.ref_name}}
-          BUILD: ${{github.run_number}}
+          VERSION: ${github.ref_name}
+          BUILD: ${github.run_number}
           GOOS: windows
           GOARCH: amd64
           CGO_ENABLED: 1
@@ -116,5 +116,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}
           path: bin/
\ No newline at end of file
diff --git a/.gitea/workflows/tag-release.yaml b/.gitea/workflows/tag-release.yaml
index 761d977..2b10fc3 100644
--- a/.gitea/workflows/tag-release.yaml
+++ b/.gitea/workflows/tag-release.yaml
@@ -87,8 +87,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
-          mv *.tar.xz bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64.tar.xz
+          fyne build --os=${GOOS} --metadata Version=${VERSION} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -100,7 +99,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 --os=${GOOS} --metadata Version=${VERSION} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}