mirror of
https://github.com/borgbase/vorta
synced 2024-12-21 23:33:13 +00:00
Bump GH upload action version, fix OS versions
This commit is contained in:
parent
2ba1861190
commit
fbd7ca19d8
2 changed files with 8 additions and 8 deletions
8
.github/scripts/generate-matrix.sh
vendored
8
.github/scripts/generate-matrix.sh
vendored
|
@ -4,13 +4,13 @@ branch_name="$2"
|
|||
if [[ "$event_name" == "workflow_dispatch" ]] || [[ "$branch_name" == "master" ]]; then
|
||||
echo '{
|
||||
"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"]
|
||||
}' | jq -c . > matrix-unit.json
|
||||
|
||||
echo '{
|
||||
"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"],
|
||||
"exclude": [{"borg-version": "2.0.0b5", "python-version": "3.8"}]
|
||||
}' | 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
|
||||
echo '{
|
||||
"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"]
|
||||
}' | jq -c . > matrix-unit.json
|
||||
|
||||
echo '{
|
||||
"python-version": ["3.10"],
|
||||
"os": ["ubuntu-latest"],
|
||||
"os": ["ubuntu-22.04"],
|
||||
"borg-version": ["1.2.4"]
|
||||
}' | jq -c . > matrix-integration.json
|
||||
fi
|
||||
|
|
8
.github/workflows/build-macos.yml
vendored
8
.github/workflows/build-macos.yml
vendored
|
@ -9,11 +9,11 @@ on:
|
|||
borg_version:
|
||||
description: 'Borg version to package'
|
||||
required: true
|
||||
default: '1.2.8'
|
||||
default: '1.4.0'
|
||||
macos_version:
|
||||
description: 'macOS version for building'
|
||||
required: true
|
||||
default: 'macos-11'
|
||||
default: 'macos-12'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
@ -71,8 +71,8 @@ jobs:
|
|||
# timeout-minutes: 15
|
||||
|
||||
- name: Upload build
|
||||
uses: actions/upload-artifact@v2
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Vorta.dmg
|
||||
path: dist/Vorta.dmg
|
||||
retention-days: 10
|
||||
retention-days: 60
|
||||
|
|
Loading…
Reference in a new issue