mirror of
https://github.com/borgbase/vorta
synced 2024-12-21 23:33:13 +00:00
Fix build on arm (#2096)
This commit is contained in:
parent
cf4370aa33
commit
090be97b7c
2 changed files with 5 additions and 5 deletions
8
.github/scripts/generate-matrix.sh
vendored
8
.github/scripts/generate-matrix.sh
vendored
|
@ -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
|
||||
|
|
2
.github/workflows/build-macos.yml
vendored
2
.github/workflows/build-macos.yml
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue