Update macOS SDK for workflow

context-labs · Apr 19, 2024 · 8ac285c · 8ac285c
1 parent d9cc6cc
commit 8ac285c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,30 +15,36 @@ 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/')
       with:
         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
diff --git 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: