From fbd7ca19d895926ba7ca4bc3545a194c2ecbfac6 Mon Sep 17 00:00:00 2001
From: Manu <manu@snapdragon.cc>
Date: Sat, 14 Sep 2024 17:46:43 +0100
Subject: [PATCH] Bump GH upload action version, fix OS versions

---
 .github/scripts/generate-matrix.sh | 8 ++++----
 .github/workflows/build-macos.yml  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/generate-matrix.sh b/.github/scripts/generate-matrix.sh
index 3f669561..c797abb5 100644
--- a/.github/scripts/generate-matrix.sh
+++ b/.github/scripts/generate-matrix.sh
@@ -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
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 962be092..712375c3 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -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