From d10d83dd052cdcaa5714ae6e525d0a9eccf33155 Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Sun, 10 Mar 2024 13:47:37 -0500 Subject: [PATCH] really fyne why is version so specific --- .gitea/workflows/build.yaml | 10 ++++++---- .gitea/workflows/pr-validation.yaml | 8 +++++--- .gitea/workflows/release-tag.yaml | 16 +++++++++------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5c93e9e..a5a8ecf 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -12,10 +12,12 @@ jobs: RUNNER_TOOL_CACHE: /toolcache runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: checkout + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-go@v5 + - name: setup go + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' - name: setup-dependencies @@ -37,7 +39,7 @@ jobs: GOFLAGS="-ldflags=-s -ldflags=-w" CGO_ENABLED=1 CC=gcc - fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/swiped-mod-switcher-$VERSION-linux-amd64 main.go + fyne package --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/swiped-mod-switcher-$VERSION-linux-amd64 main.go - name: build windows run: | @@ -48,7 +50,7 @@ jobs: GOFLAGS="-ldflags=-H=windowsgui -ldflags=-s -ldflags=-w" CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc - fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/swiped-mod-switcher-$VERSION-windows-amd64.exe main.go + fyne package --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/swiped-mod-switcher-$VERSION-windows-amd64.exe main.go - uses: actions/upload-artifact@v3 with: diff --git a/.gitea/workflows/pr-validation.yaml b/.gitea/workflows/pr-validation.yaml index a18127e..17d034e 100644 --- a/.gitea/workflows/pr-validation.yaml +++ b/.gitea/workflows/pr-validation.yaml @@ -12,10 +12,12 @@ jobs: RUNNER_TOOL_CACHE: /toolcache runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: checkout + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-go@v5 + - name: setup go + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' - name: setup dependencies @@ -37,7 +39,7 @@ jobs: GOFLAGS="-ldflags=-s -ldflags=-w" CGO_ENABLED=1 CC=gcc - fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-linux-amd64 main.go + fyne package --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-linux-amd64 main.go - name: run tests run: go test -v ./... - name: Check Vet diff --git a/.gitea/workflows/release-tag.yaml b/.gitea/workflows/release-tag.yaml index e72da4b..4927422 100644 --- a/.gitea/workflows/release-tag.yaml +++ b/.gitea/workflows/release-tag.yaml @@ -8,10 +8,12 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: checkout + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-go@v5 + - name: setup go + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' - name: setup-dependencies @@ -24,7 +26,7 @@ jobs: go get fyne.io/fyne/v2@latest go install fyne.io/fyne/v2/cmd/fyne@latest - - name: build-linux + - name: build linux run: | VERSION=${{github.ref_name}} BUILD=${{github.run_number}} @@ -33,9 +35,9 @@ jobs: GOFLAGS="-ldflags=-s -ldflags=-w" CGO_ENABLED=1 CC=gcc - fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go + fyne package --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION}.${BUILD}-linux-amd64 main.go - - name: build-windows + - name: build windows run: | VERSION=${{github.ref_name}} BUILD=${{github.run_number}} @@ -44,9 +46,9 @@ jobs: GOFLAGS="-ldflags=-H=windowsgui -ldflags=-s -ldflags=-w" CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc - fyne package --appVersion=${VERSION} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go + fyne package --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION}.${BUILD}-windows-amd64.exe main.go - - name: add-release-binaries + - name: add release binaries uses: https://gitea.com/actions/release-action@main with: files: |-