Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build on arm #2096

Merged
merged 1 commit into from
Oct 18, 2024
Merged

Fix build on arm #2096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/scripts/generate-matrix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading