From 8ac285c1a8a454025979074c05c03255f7d44147 Mon Sep 17 00:00:00 2001 From: Meta Spartan Date: Thu, 18 Apr 2024 19:20:09 -0600 Subject: [PATCH] Update macOS SDK for workflow --- .github/workflows/release.yml | 22 ++++++++++++++-------- .goreleaser.yaml | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 18af239..1b58785 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,25 +15,31 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: '1.20' + go-version: '1.20' # Ensure this is the version you want to use - - name: Install fyne-cross + - name: Download macOS SDK run: | - go install github.com/fyne-io/fyne-cross@latest + curl -L -o MacOSX11.1.sdk.tar.xz "https://github.com/joseluisq/macosx-sdks/releases/download/11.1/MacOSX11.1.sdk.tar.xz" + sudo mkdir -p /opt/MacOSX11.1.sdk + sudo tar -xJf MacOSX11.1.sdk.tar.xz -C /opt/MacOSX11.1.sdk + + - name: Install fyne-cross + run: go install github.com/fyne-io/fyne-cross@latest - name: Install X11 development libraries run: | sudo apt-get update sudo apt-get install -y libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libgl1-mesa-dev libxi-dev libxext-dev libglu1-mesa-dev xorg-dev - + - name: Build run: | fyne-cross windows -arch=amd64 -icon icon.png fyne-cross linux -arch=amd64 -icon icon.png - fyne-cross darwin -arch=amd64 -icon icon.png + fyne-cross darwin -arch=arm64 -icon icon.png env: - FYNE_CROSS_TARGETS: windows/amd64 linux/amd64 darwin/amd64 - + FYNE_CROSS_TARGETS: windows/amd64 linux/amd64 darwin/arm64 + FYNE_CROSS_DARWIN_SDK: /opt/MacOSX11.1.sdk + - name: Release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') @@ -41,4 +47,4 @@ jobs: files: | fyne-cross/bin/windows-amd64/Ollamark.exe fyne-cross/bin/linux-amd64/Ollamark - fyne-cross/bin/darwin-amd64/Ollamark.app + fyne-cross/bin/darwin-arm64/Ollamark.app \ No newline at end of file diff --git a/.goreleaser.yaml b/.goreleaser.yaml index a90b5b9..46e4f17 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -11,7 +11,7 @@ builds: - arm64 binary: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}" hooks: - post: mv "{{ .Path }}" "{{ .Path }}{{ if eq .Os 'windows' }}.exe{{ end }}" + post: mv '{{ .Path }}' '{{ .Path }}{{ if eq .Os "windows" }}.exe{{ end }}' # Disable archives archives: