mirror/vorta
1
0
Fork 0
mirror of https://github.com/borgbase/vorta synced 2024-12-22 07:43:09 +00:00
Code Issues Releases Wiki Activity

Bump GH upload action version, fix OS versions

Browse source
This commit is contained in:
Manu 2024-09-14 17:46:43 +01:00
parent 2ba1861190
commit fbd7ca19d8
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/scripts/generate-matrix.sh vendored
View file

@ -4,13 +4,13 @@ branch_name="$2"
if [[ "$event_name" == "workflow_dispatch" ]] || [[ "$branch_name" == "master" ]]; then if [[ "$event_name" == "workflow_dispatch" ]] || [[ "$branch_name" == "master" ]]; then
echo '{ echo '{
"python-version": ["3.8", "3.9", "3.10", "3.11"], "python-version": ["3.8", "3.9", "3.10", "3.11"],
"os": ["ubuntu-latest", "macos-latest"], "os": ["ubuntu-22.04", "macos-12"],
"borg-version": ["1.2.4"] "borg-version": ["1.2.4"]
}' | jq -c . > matrix-unit.json }' | jq -c . > matrix-unit.json
echo '{ echo '{
"python-version": ["3.8", "3.9", "3.10", "3.11"], "python-version": ["3.8", "3.9", "3.10", "3.11"],
"os": ["ubuntu-latest", "macos-latest"], "os": ["ubuntu-22.04", "macos-12"],
"borg-version": ["1.1.18", "1.2.2", "1.2.4", "2.0.0b5"], "borg-version": ["1.1.18", "1.2.2", "1.2.4", "2.0.0b5"],
"exclude": [{"borg-version": "2.0.0b5", "python-version": "3.8"}] "exclude": [{"borg-version": "2.0.0b5", "python-version": "3.8"}]
}' | jq -c . > matrix-integration.json }' | jq -c . > matrix-integration.json
@ -18,13 +18,13 @@ if [[ "$event_name" == "workflow_dispatch" ]] || [[ "$branch_name" == "master" ]
elif [[ "$event_name" == "push" ]] || [[ "$event_name" == "pull_request" ]]; then elif [[ "$event_name" == "push" ]] || [[ "$event_name" == "pull_request" ]]; then
echo '{ echo '{
"python-version": ["3.8", "3.9", "3.10", "3.11"], "python-version": ["3.8", "3.9", "3.10", "3.11"],
"os": ["ubuntu-latest", "macos-latest"], "os": ["ubuntu-22.04", "macos-12"],
"borg-version": ["1.2.4"] "borg-version": ["1.2.4"]
}' | jq -c . > matrix-unit.json }' | jq -c . > matrix-unit.json
echo '{ echo '{
"python-version": ["3.10"], "python-version": ["3.10"],
"os": ["ubuntu-latest"], "os": ["ubuntu-22.04"],
"borg-version": ["1.2.4"] "borg-version": ["1.2.4"]
}' | jq -c . > matrix-integration.json }' | jq -c . > matrix-integration.json
fi fi

8
.github/workflows/build-macos.yml vendored
View file

@ -9,11 +9,11 @@ on:
borg_version: borg_version:
description: 'Borg version to package' description: 'Borg version to package'
required: true required: true
default: '1.2.8' default: '1.4.0'
macos_version: macos_version:
description: 'macOS version for building' description: 'macOS version for building'
required: true required: true
default: 'macos-11' default: 'macos-12'
jobs: jobs:
build: build:
@ -71,8 +71,8 @@ jobs:
# timeout-minutes: 15 # timeout-minutes: 15
- name: Upload build - name: Upload build
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v4
with: with:
name: Vorta.dmg name: Vorta.dmg
path: dist/Vorta.dmg path: dist/Vorta.dmg
retention-days: 10 retention-days: 60