From 58bb19b43f4299a926c18234a76d9310b5fc1ce7 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Sun, 10 Mar 2024 00:41:03 -0600 Subject: [PATCH 01/15] add actions --- .gitea/workflows/build.yaml | 28 ++++++++++++++++++++++ .gitea/workflows/pr-validation.yaml | 37 +++++++++++++++++++++++++++++ .gitea/workflows/release-tag.yaml | 32 +++++++++++++++++++++++++ build.cmd | 2 +- main.go | 4 +++- 5 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 .gitea/workflows/build.yaml create mode 100644 .gitea/workflows/pr-validation.yaml create mode 100644 .gitea/workflows/release-tag.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml new file mode 100644 index 0000000..9c297bb --- /dev/null +++ b/.gitea/workflows/build.yaml @@ -0,0 +1,28 @@ +name: Build and Artifact Vulture +on: + push: + branches: + - "master" + - "develop" + +jobs: + build: + env: + RUNNER_TOOL_CACHE: /toolcache + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + - name: setup-dependencies + run: | + apt install mingw-w64 gcc + - name: build-linux + run: | + GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=gcc go build -v -ldflags="-s -w -X 'main.Version=${{github.ref_name}}'" -o bin/sw1ped-mod-switcher-${{github.ref_name}}-linux-amd64 + - name: build-windows + run: | + GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw64-gcc go build -v -ldflags="-s -w -X 'main.Version=${{github.ref_name}}'" -o bin/sw1ped-mod-switcher-${{github.ref_name}}-windows-amd64.exe \ No newline at end of file diff --git a/.gitea/workflows/pr-validation.yaml b/.gitea/workflows/pr-validation.yaml new file mode 100644 index 0000000..07acf91 --- /dev/null +++ b/.gitea/workflows/pr-validation.yaml @@ -0,0 +1,37 @@ +name: PR Validation +on: + pull_request: + branches: + - master + - develop + +jobs: + build: + name: Build and Test Vulture + env: + RUNNER_TOOL_CACHE: /toolcache + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + - name: setup-dependencies + run: | + apt install mingw-w64 gcc + - name: Build + run: go build -v ./... + - name: Run Tests + run: go test -v ./... + - name: Check Vet + run: go vet ./... + - name: Check Formatting + run: | + gofmt -s -l . + if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then exit 1; fi + - name: Check Lint + uses: golangci/golangci-lint-action@v3 + with: + version: latest \ No newline at end of file diff --git a/.gitea/workflows/release-tag.yaml b/.gitea/workflows/release-tag.yaml new file mode 100644 index 0000000..119c484 --- /dev/null +++ b/.gitea/workflows/release-tag.yaml @@ -0,0 +1,32 @@ +name: release + +on: + push: + tags: + - '*' + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + - name: setup-dependencies + run: | + apt install mingw-w64 gcc + - name: release-build-linux + run: GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X 's1d3sw1ped/vulture/config.BuildVersion=${{github.ref_name}}'" -o bin/vulture-${{github.ref_name}}-linux-amd64 + - name: release-build-windows + run: GOOS=windows GOARCH=amd64 go build -ldflags="-s -w -X 's1d3sw1ped/vulture/config.BuildVersion=${{github.ref_name}}'" -o bin/vulture-${{github.ref_name}}-windows-amd64.exe + - name: release-build-darwin + run: GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w -X 's1d3sw1ped/vulture/config.BuildVersion=${{github.ref_name}}'" -o bin/vulture-${{github.ref_name}}-darwin-amd64 + - name: update-release + uses: https://gitea.com/actions/release-action@main + with: + files: |- + bin/** + api_key: '${{secrets.RELEASE_TOKEN}}' diff --git a/build.cmd b/build.cmd index 6757e4e..c7813dc 100644 --- a/build.cmd +++ b/build.cmd @@ -1 +1 @@ -fyne package -os windows -icon .\cpms.png \ No newline at end of file +fyne package --os windows --icon .\cpms.png --exe SwipedModSwitcher \ No newline at end of file diff --git a/main.go b/main.go index 4c7a003..ae72b66 100644 --- a/main.go +++ b/main.go @@ -17,6 +17,8 @@ import ( "gopkg.in/yaml.v3" ) +var Version = "" + type Config struct { ModProfilesDirectory string `yaml:"mod_profiles_dir"` GameModsDirectory string `yaml:"game_mods_dir"` @@ -69,7 +71,7 @@ func main() { cfg = loadConfig() ap := app.New() - wp := ap.NewWindow("Swiped Mod Switcher") + wp := ap.NewWindow("Swiped Mod Switcher " + Version) wp.Resize(fyne.NewSize(600, 1)) wp.CenterOnScreen() From 99a59b47c22c0743b08b0cdadbec06a52fd3af7d Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Sun, 10 Mar 2024 21:41:26 -0500 Subject: [PATCH 02/15] please --- .gitea/workflows/build.yaml | 28 ---------------------- .gitea/workflows/pr-validation.yaml | 37 ----------------------------- .gitea/workflows/push-ci.yaml | 6 ++--- .gitea/workflows/release-tag.yaml | 32 ------------------------- FyneApp.toml | 10 ++++---- 5 files changed, 7 insertions(+), 106 deletions(-) delete mode 100644 .gitea/workflows/build.yaml delete mode 100644 .gitea/workflows/pr-validation.yaml delete mode 100644 .gitea/workflows/release-tag.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml deleted file mode 100644 index 9c297bb..0000000 --- a/.gitea/workflows/build.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: Build and Artifact Vulture -on: - push: - branches: - - "master" - - "develop" - -jobs: - build: - env: - RUNNER_TOOL_CACHE: /toolcache - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - - name: setup-dependencies - run: | - apt install mingw-w64 gcc - - name: build-linux - run: | - GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=gcc go build -v -ldflags="-s -w -X 'main.Version=${{github.ref_name}}'" -o bin/sw1ped-mod-switcher-${{github.ref_name}}-linux-amd64 - - name: build-windows - run: | - GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw64-gcc go build -v -ldflags="-s -w -X 'main.Version=${{github.ref_name}}'" -o bin/sw1ped-mod-switcher-${{github.ref_name}}-windows-amd64.exe \ No newline at end of file diff --git a/.gitea/workflows/pr-validation.yaml b/.gitea/workflows/pr-validation.yaml deleted file mode 100644 index 07acf91..0000000 --- a/.gitea/workflows/pr-validation.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: PR Validation -on: - pull_request: - branches: - - master - - develop - -jobs: - build: - name: Build and Test Vulture - env: - RUNNER_TOOL_CACHE: /toolcache - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - - name: setup-dependencies - run: | - apt install mingw-w64 gcc - - name: Build - run: go build -v ./... - - name: Run Tests - run: go test -v ./... - - name: Check Vet - run: go vet ./... - - name: Check Formatting - run: | - gofmt -s -l . - if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then exit 1; fi - - name: Check Lint - uses: golangci/golangci-lint-action@v3 - with: - version: latest \ No newline at end of file diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index abcae19..a868a29 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -91,25 +91,23 @@ 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 package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH} main.go env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} GOOS: linux GOARCH: amd64 - EXE: "" CGO_ENABLED: 1 CC: gcc - 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 package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe main.go env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} GOOS: windows GOARCH: amd64 - EXE: .exe CGO_ENABLED: 1 CC: x86_64-w64-mingw32-gcc diff --git a/.gitea/workflows/release-tag.yaml b/.gitea/workflows/release-tag.yaml deleted file mode 100644 index 119c484..0000000 --- a/.gitea/workflows/release-tag.yaml +++ /dev/null @@ -1,32 +0,0 @@ -name: release - -on: - push: - tags: - - '*' - -jobs: - release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - - name: setup-dependencies - run: | - apt install mingw-w64 gcc - - name: release-build-linux - run: GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X 's1d3sw1ped/vulture/config.BuildVersion=${{github.ref_name}}'" -o bin/vulture-${{github.ref_name}}-linux-amd64 - - name: release-build-windows - run: GOOS=windows GOARCH=amd64 go build -ldflags="-s -w -X 's1d3sw1ped/vulture/config.BuildVersion=${{github.ref_name}}'" -o bin/vulture-${{github.ref_name}}-windows-amd64.exe - - name: release-build-darwin - run: GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w -X 's1d3sw1ped/vulture/config.BuildVersion=${{github.ref_name}}'" -o bin/vulture-${{github.ref_name}}-darwin-amd64 - - name: update-release - uses: https://gitea.com/actions/release-action@main - with: - files: |- - bin/** - api_key: '${{secrets.RELEASE_TOKEN}}' diff --git a/FyneApp.toml b/FyneApp.toml index 3ec3d4a..4e77148 100644 --- a/FyneApp.toml +++ b/FyneApp.toml @@ -1,6 +1,6 @@ [Details] -Icon = "icon.png" -Name = "Swiped Mod Switcher" -ID = "com.s1d3sw1ped.swipedmodswitcher" -Version = "0.0.0" -Build = 1 \ No newline at end of file + Icon = "icon.png" + Name = "Swiped Mod Switcher" + ID = "com.s1d3sw1ped.swipedmodswitcher" + Version = "0.0.0" + Build = 2 From 17b0d9f72e002cb5f2f8e587e8ee8405934f37ff Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Sun, 10 Mar 2024 21:46:47 -0500 Subject: [PATCH 03/15] please --- .gitea/workflows/push-ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index a868a29..ee6eff4 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -91,7 +91,7 @@ jobs: - name: Build for linux run: | - fyne package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH} main.go + fyne package --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH} main.go env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} @@ -102,7 +102,7 @@ jobs: - name: Build for windows run: | - fyne package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe main.go + fyne package --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe main.go env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} From ee19aadac98060a3514ff757c1f960c0ce9f6d83 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Sun, 10 Mar 2024 21:56:40 -0500 Subject: [PATCH 04/15] please --- .gitea/workflows/push-ci.yaml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index ee6eff4..ccf6a23 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -89,27 +89,14 @@ jobs: run: | go mod tidy - - name: Build for linux + - name: Build run: | - fyne package --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH} main.go + GOOS=linux GOARCH=amd64 CC=gcc fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64 main.go + GOOS=windows GOARCH=amd64 CC=gcc fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} - GOOS: linux - GOARCH: amd64 CGO_ENABLED: 1 - CC: gcc - - - name: Build for windows - run: | - fyne package --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe main.go - env: - VERSION: ${{github.ref_name}} - BUILD: ${{github.run_number}} - GOOS: windows - GOARCH: amd64 - CGO_ENABLED: 1 - CC: x86_64-w64-mingw32-gcc - name: Upload artifact uses: actions/upload-artifact@v3 From e1db654a489f6e1d589303f8935d6b5af8af7388 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Sun, 10 Mar 2024 22:00:02 -0500 Subject: [PATCH 05/15] please --- .gitea/workflows/push-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index ccf6a23..02cbfd0 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -92,7 +92,7 @@ jobs: - name: Build run: | GOOS=linux GOARCH=amd64 CC=gcc fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64 main.go - GOOS=windows GOARCH=amd64 CC=gcc fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go + GOOS=windows GOARCH=amd64 CC=x86_64-w64-mingw32-gcc fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} From e37e629630d7cfce9f86d74fa4933edf415082c8 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Sun, 10 Mar 2024 22:08:51 -0500 Subject: [PATCH 06/15] please --- .gitea/workflows/push-ci.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index 02cbfd0..7ae384a 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -91,8 +91,11 @@ jobs: - name: Build run: | - GOOS=linux GOARCH=amd64 CC=gcc fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64 main.go - GOOS=windows GOARCH=amd64 CC=x86_64-w64-mingw32-gcc fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go + mkdir bin/ + GOOS=linux GOARCH=amd64 CC=gcc fyne package --appBuild=${BUILD} --exe bin2/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go + mv bin2/* bin/ + GOOS=windows GOARCH=amd64 CC=x86_64-w64-mingw32-gcc fyne package --appBuild=${BUILD} --exe bin2/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go + mv bin2/* bin/ env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} From 4924466a938fcc1ca115a4a5a44e00e7bf97404d Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Mon, 11 Mar 2024 11:45:17 -0500 Subject: [PATCH 07/15] please --- .gitea/workflows/push-ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index 7ae384a..a2a3063 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -91,15 +91,15 @@ jobs: - name: Build run: | + mkdir bin2/ mkdir bin/ - GOOS=linux GOARCH=amd64 CC=gcc fyne package --appBuild=${BUILD} --exe bin2/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go + GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=gcc fyne package -os=linux -appBuild=${BUILD} -exe bin2/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go mv bin2/* bin/ - GOOS=windows GOARCH=amd64 CC=x86_64-w64-mingw32-gcc fyne package --appBuild=${BUILD} --exe bin2/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go + GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc fyne package -os=windows -appBuild=${BUILD} -exe bin2/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go mv bin2/* bin/ env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} - CGO_ENABLED: 1 - name: Upload artifact uses: actions/upload-artifact@v3 From 8ec9119bc12febafe9f3d32fb420696ba8ad3b23 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Mon, 11 Mar 2024 12:46:27 -0500 Subject: [PATCH 08/15] please --- .gitea/workflows/push-ci.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index a2a3063..3436dd7 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -91,12 +91,13 @@ jobs: - name: Build run: | - mkdir bin2/ - mkdir bin/ - GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=gcc fyne package -os=linux -appBuild=${BUILD} -exe bin2/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go - mv bin2/* bin/ - GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc fyne package -os=windows -appBuild=${BUILD} -exe bin2/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go - mv bin2/* bin/ + ls + GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=gcc fyne package -os=linux -appBuild=${BUILD} -exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go + ls + ls bin + GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc fyne package -os=windows -appBuild=${BUILD} -exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go + ls + ls bin env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} From 3667bfae522835bda6bd5c7c5f2dd0eb9bf381a3 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Mon, 11 Mar 2024 14:01:07 -0500 Subject: [PATCH 09/15] please --- .gitea/workflows/push-ci.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index 3436dd7..de38719 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -91,12 +91,9 @@ jobs: - name: Build run: | - ls GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=gcc fyne package -os=linux -appBuild=${BUILD} -exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go - ls ls bin GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc fyne package -os=windows -appBuild=${BUILD} -exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go - ls ls bin env: VERSION: ${{github.ref_name}} From be35430727d58deda03daaf43e7ae7009aba59a2 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Mon, 11 Mar 2024 14:09:01 -0500 Subject: [PATCH 10/15] please --- .gitea/workflows/push-ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index de38719..eb4442f 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -92,9 +92,9 @@ jobs: - name: Build run: | GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=gcc fyne package -os=linux -appBuild=${BUILD} -exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go - ls bin + cp *.tar.xz bin/ GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc fyne package -os=windows -appBuild=${BUILD} -exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go - ls bin + ls env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} From e281fbafdb086c971684f0fbb1ead510bacefb8d Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Mon, 11 Mar 2024 21:42:16 -0500 Subject: [PATCH 11/15] ci and general changes --- .gitea/workflows/pull-request-ci.yaml | 9 ++++++--- .gitea/workflows/push-ci.yaml | 27 +++++++++++++++++++++------ .gitea/workflows/tag-release.yaml | 3 +-- main.go | 12 +++++++++--- 4 files changed, 37 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/pull-request-ci.yaml b/.gitea/workflows/pull-request-ci.yaml index 08cacd7..c8e7dc2 100644 --- a/.gitea/workflows/pull-request-ci.yaml +++ b/.gitea/workflows/pull-request-ci.yaml @@ -90,8 +90,10 @@ jobs: - name: Build for linux run: | - fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}${EXE} main.go + 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 env: + VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} GOOS: linux GOARCH: amd64 @@ -101,12 +103,13 @@ jobs: - name: Build for windows run: | - fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}${EXE} main.go + fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go env: + VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} GOOS: windows GOARCH: amd64 - EXE: .exe + EXE: ".exe" CGO_ENABLED: 1 CC: x86_64-w64-mingw32-gcc diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index eb4442f..6d71745 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -6,7 +6,7 @@ on: jobs: lint: name: Lint - env: + env: RUNNER_TOOL_CACHE: /toolcache runs-on: ubuntu-latest steps: @@ -89,15 +89,30 @@ jobs: run: | go mod tidy - - name: Build + - name: Build for linux run: | - GOOS=linux GOARCH=amd64 CGO_ENABLED=1 CC=gcc fyne package -os=linux -appBuild=${BUILD} -exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go - cp *.tar.xz bin/ - GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc fyne package -os=windows -appBuild=${BUILD} -exe bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go - ls + 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 env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} + GOOS: linux + GOARCH: amd64 + EXE: "" + CGO_ENABLED: 1 + CC: gcc + + - 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 + env: + VERSION: ${{github.ref_name}} + BUILD: ${{github.run_number}} + GOOS: windows + GOARCH: amd64 + EXE: ".exe" + CGO_ENABLED: 1 + CC: x86_64-w64-mingw32-gcc - name: Upload artifact uses: actions/upload-artifact@v3 diff --git a/.gitea/workflows/tag-release.yaml b/.gitea/workflows/tag-release.yaml index 76a993c..038e2bc 100644 --- a/.gitea/workflows/tag-release.yaml +++ b/.gitea/workflows/tag-release.yaml @@ -88,6 +88,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 env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} @@ -97,7 +98,6 @@ jobs: CGO_ENABLED: 1 CC: gcc - - 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 @@ -110,7 +110,6 @@ jobs: CGO_ENABLED: 1 CC: x86_64-w64-mingw32-gcc - - name: Release binaries uses: https://gitea.com/actions/release-action@main with: diff --git a/main.go b/main.go index fae2555..343ee9d 100644 --- a/main.go +++ b/main.go @@ -63,10 +63,12 @@ var cfg *Config func main() { if !admin.Admin() { + fmt.Println("not running as administrator relaunching") if err := admin.RunSelfElevated(); err != nil { panic(err) } os.Exit(0) + return // just incase } cfg = loadConfig() @@ -138,9 +140,13 @@ func fillGrid(grid *fyne.Container, parent fyne.Window) { grid.Hide() defer grid.Show() grid.RemoveAll() - for _, profile := range profiles { - profilename := filepath.Base(profile) - grid.Add(widget.NewButton(profilename, makeIFunc(profile, archive, parent))) + if admin.Admin() { + for _, profile := range profiles { + profilename := filepath.Base(profile) + grid.Add(widget.NewButton(profilename, makeIFunc(profile, archive, parent))) + } + } else { + grid.Add(widget.NewLabel("not running as administrator")) } } From 9703682b4af7605fbbb81b98f8f624aea0ead387 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Mon, 11 Mar 2024 21:59:14 -0500 Subject: [PATCH 12/15] try fixing ci again --- .gitea/workflows/push-ci.yaml | 9 ++++----- .gitea/workflows/tag-release.yaml | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml index 6d71745..7a8024b 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -91,26 +91,25 @@ 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 Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/sw1ped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}} main.go + ls bin env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} GOOS: linux GOARCH: amd64 - EXE: "" CGO_ENABLED: 1 CC: gcc - 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 Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/sw1ped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}}.exe main.go + ls bin env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} GOOS: windows GOARCH: amd64 - EXE: ".exe" CGO_ENABLED: 1 CC: x86_64-w64-mingw32-gcc diff --git a/.gitea/workflows/tag-release.yaml b/.gitea/workflows/tag-release.yaml index 038e2bc..761d977 100644 --- a/.gitea/workflows/tag-release.yaml +++ b/.gitea/workflows/tag-release.yaml @@ -87,7 +87,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 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 env: VERSION: ${{github.ref_name}} @@ -100,7 +100,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 package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go env: VERSION: ${{github.ref_name}} BUILD: ${{github.run_number}} From b04e6533501fa8838ab6f7be64552b2f5a91979d Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Mon, 11 Mar 2024 23:39:24 -0500 Subject: [PATCH 13/15] 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}} From d9a75a5e21b775ef4f8e0e7bbe6fc9ba63bb4317 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Mon, 11 Mar 2024 23:56:22 -0500 Subject: [PATCH 14/15] fix --- .gitea/workflows/pull-request-ci.yaml | 4 ++-- .gitea/workflows/push-ci.yaml | 14 +++++++------- .gitea/workflows/tag-release.yaml | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/pull-request-ci.yaml b/.gitea/workflows/pull-request-ci.yaml index 8fe8959..e8bada9 100644 --- a/.gitea/workflows/pull-request-ci.yaml +++ b/.gitea/workflows/pull-request-ci.yaml @@ -90,7 +90,7 @@ jobs: - name: Build for linux run: | - fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH} + 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}} @@ -102,7 +102,7 @@ jobs: - name: Build for windows run: | - fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe + 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 89061e7..5c3dba1 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 Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH} + 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 Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe + 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 2b10fc3..9a4725b 100644 --- a/.gitea/workflows/tag-release.yaml +++ b/.gitea/workflows/tag-release.yaml @@ -87,7 +87,7 @@ jobs: - name: Build for linux run: | - fyne build --os=${GOOS} --metadata Version=${VERSION} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH} + 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}} @@ -99,7 +99,7 @@ jobs: - name: Build for windows run: | - fyne build --os=${GOOS} --metadata Version=${VERSION} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH}.exe + 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}} From 07f11c7d222ba25985d0ae2f71b8dd93185509aa Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Tue, 12 Mar 2024 00:03:21 -0500 Subject: [PATCH 15/15] fix --- .gitea/workflows/pull-request-ci.yaml | 4 ++-- .gitea/workflows/push-ci.yaml | 4 ++-- .gitea/workflows/tag-release.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/pull-request-ci.yaml b/.gitea/workflows/pull-request-ci.yaml index e8bada9..8fe8959 100644 --- a/.gitea/workflows/pull-request-ci.yaml +++ b/.gitea/workflows/pull-request-ci.yaml @@ -90,7 +90,7 @@ jobs: - name: Build for linux run: | - fyne build --os=${{GOOS}} --metadata Build=${{BUILD}} -o bin/swiped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}} + 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}} @@ -102,7 +102,7 @@ jobs: - name: Build for windows run: | - fyne build --os=${{GOOS}} --metadata Build=${{BUILD}} -o bin/swiped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}}.exe + 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 5c3dba1..8187c99 100644 --- a/.gitea/workflows/push-ci.yaml +++ b/.gitea/workflows/push-ci.yaml @@ -91,7 +91,7 @@ jobs: - name: Build for linux run: | - fyne build --os=${{GOOS}} --metadata Build=${{BUILD}} -o bin/swiped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}} + fyne build --os=${GOOS} --metadata Build=${BUILD} -o bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-${GOOS}-${GOARCH} ls bin env: VERSION: ${{github.ref_name}} @@ -103,7 +103,7 @@ jobs: - name: Build for windows run: | - fyne build --os=${{GOOS}} --metadata Build=${{BUILD}} -o bin/swiped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}}.exe + 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}} diff --git a/.gitea/workflows/tag-release.yaml b/.gitea/workflows/tag-release.yaml index 9a4725b..bdffbe6 100644 --- a/.gitea/workflows/tag-release.yaml +++ b/.gitea/workflows/tag-release.yaml @@ -87,7 +87,7 @@ jobs: - name: Build for linux run: | - fyne build --os=${{GOOS}} --metadata Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/swiped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}} + 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}} @@ -99,7 +99,7 @@ jobs: - name: Build for windows run: | - fyne build --os=${{GOOS}} --metadata Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/swiped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}}.exe + 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}}