Fix build on arm

borgbase · Oct 18, 2024 · bccd4b0 · bccd4b0
1 parent cf4370a
commit bccd4b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/scripts/generate-matrix.sh b/.github/scripts/generate-matrix.sh
@@ -3,21 +3,21 @@ branch_name="$2"
 
 if [[ "$event_name" == "workflow_dispatch" ]] || [[ "$branch_name" == "master" ]]; then
     echo '{
-      "python-version": ["3.9", "3.10", "3.11"],
+      "python-version": ["3.9", "3.10", "3.11", "3.12"],
       "os": ["ubuntu-22.04", "macos-14"],
       "borg-version": ["1.4.0"]
     }' | jq -c . > matrix-unit.json
 
     echo '{
-      "python-version": ["3.9", "3.10", "3.11"],
-      "os": ["ubuntu-22.04", "macos-14"],
+      "python-version": ["3.11"],
+      "os": ["ubuntu-22.04"],
       "borg-version": ["1.1.18", "1.2.8", "1.4.0", "2.0.0b12"],
       "exclude": [{"borg-version": "2.0.0b12", "python-version": "3.8"}]
     }' | jq -c . > matrix-integration.json
 
 elif [[ "$event_name" == "push" ]] || [[ "$event_name" == "pull_request" ]]; then
     echo '{
-      "python-version": ["3.9", "3.11"],
+      "python-version": ["3.9", "3.12"],
       "os": ["ubuntu-22.04", "macos-14"],
       "borg-version": ["1.2.8"]
     }' | jq -c . > matrix-unit.json

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Package with PyInstaller
       run: |
         pyinstaller --clean --noconfirm package/vorta.spec
-        cp -R /usr/local/Caskroom/sparkle/*/Sparkle.framework dist/Vorta.app/Contents/Frameworks/
+        cp -R /opt/homebrew/Caskroom/sparkle/*/Sparkle.framework dist/Vorta.app/Contents/Frameworks/
         curl -LJO https://github.com/borgbackup/borg/releases/download/${{ github.event.inputs.borg_version }}/borg-macos1012.tgz
         tar xvf borg-macos1012.tgz -C dist/Vorta.app/Contents/Resources/
         cd dist && zip -rq --symlinks Vorta.zip Vorta.app