From 99a59b47c22c0743b08b0cdadbec06a52fd3af7d Mon Sep 17 00:00:00 2001 From: Justin Harms Date: Sun, 10 Mar 2024 21:41:26 -0500 Subject: [PATCH] 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