From cd3c27975e5522a90e844f1ca7db579f56230387 Mon Sep 17 00:00:00 2001 From: Meta Spartan Date: Tue, 30 Apr 2024 11:28:43 -0600 Subject: [PATCH] Updated workflow versioning --- .github/workflows/go.yml | 8 ++------ .github/workflows/release.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index dabc06c..16027bd 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -3,10 +3,6 @@ name: Go on: push: branches: [ "main" ] - tags: - - 'v*' - pull_request: - branches: [ "main" ] jobs: build: @@ -15,7 +11,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: '1.20' @@ -32,7 +28,7 @@ jobs: - name: Run GoReleaser if: startsWith(github.ref, 'refs/tags/') - uses: goreleaser/goreleaser-action@v4 + uses: goreleaser/goreleaser-action@v5 with: version: latest args: release --clean diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 018c55f..b71dcf8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,15 +13,15 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: '1.20' # Ensure this is the version you want to use - name: Download macOS SDK run: | - curl -L -o MacOSX12.3.sdk.tar.xz "https://github.com/joseluisq/macosx-sdks/releases/download/12.3/MacOSX12.3.sdk.tar.xz" - sudo mkdir -p /opt/MacOSX12.3.sdk - sudo tar -xJf MacOSX12.3.sdk.tar.xz -C /opt/MacOSX12.3.sdk + curl -L -o MacOSX12.5.sdk.tar.xz "https://github.com/joseluisq/macosx-sdks/releases/download/12.5/MacOSX12.5.sdk.tar.xz" + sudo mkdir -p /opt/MacOSX12.5.sdk + sudo tar -xJf MacOSX12.5.sdk.tar.xz -C /opt/MacOSX12.5.sdk - name: Install fyne-cross run: go install github.com/fyne-io/fyne-cross@latest @@ -35,10 +35,10 @@ jobs: run: | fyne-cross windows -arch=amd64 -icon icon.png fyne-cross linux -arch=amd64 -icon icon.png - fyne-cross darwin -arch=arm64 -icon icon.png --macosx-sdk-path /opt/MacOSX12.3.sdk -app-id com.contextlabs.ollamark + fyne-cross darwin -arch=arm64 -icon icon.png --macosx-sdk-path /opt/MacOSX12.5.sdk -app-id com.contextlabs.ollamark env: FYNE_CROSS_TARGETS: windows/amd64 linux/amd64 darwin/arm64 - FYNE_CROSS_DARWIN_SDK: /opt/MacOSX12.3.sdk + FYNE_CROSS_DARWIN_SDK: /opt/MacOSX12.5.sdk - name: Release uses: softprops/action-gh-release@v1