Fix macOS tests (#2095)

borgbase · Oct 18, 2024 · cf4370a · cf4370a
1 parent 85c30ca
commit cf4370a
Show file tree

Hide file tree

Showing 4 changed files with 225 additions and 212 deletions.
diff --git a/.github/scripts/generate-matrix.sh b/.github/scripts/generate-matrix.sh
@@ -3,28 +3,28 @@ 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-22.04", "macos-12"],
-      "borg-version": ["1.2.4"]
+      "python-version": ["3.9", "3.10", "3.11"],
+      "os": ["ubuntu-22.04", "macos-14"],
+      "borg-version": ["1.4.0"]
     }' | jq -c . > matrix-unit.json
 
     echo '{
-      "python-version": ["3.8", "3.9", "3.10", "3.11"],
-      "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"}]
+      "python-version": ["3.9", "3.10", "3.11"],
+      "os": ["ubuntu-22.04", "macos-14"],
+      "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.8", "3.9", "3.10", "3.11"],
-      "os": ["ubuntu-22.04", "macos-12"],
-      "borg-version": ["1.2.4"]
+      "python-version": ["3.9", "3.11"],
+      "os": ["ubuntu-22.04", "macos-14"],
+      "borg-version": ["1.2.8"]
     }' | jq -c . > matrix-unit.json
 
     echo '{
-      "python-version": ["3.10"],
+      "python-version": ["3.11"],
       "os": ["ubuntu-22.04"],
-      "borg-version": ["1.2.4"]
+      "borg-version": ["1.2.8"]
     }' | jq -c . > matrix-integration.json
 fi
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -31,12 +31,12 @@ jobs:
       run: |
         brew install --cask sparkle
         brew install create-dmg
-        pip3 install --upgrade pip
-        pip3 install -r dev.txt
+        pip3 install --break-system-packages --upgrade pip
+        pip3 install --break-system-packages -r dev.txt
       working-directory: requirements.d
     - name: Install Vorta
       run: |
-        pip3 install .
+        pip3 install --break-system-packages .
     - name: Package with PyInstaller
       run: |
         pyinstaller --clean --noconfirm package/vorta.spec

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -51,7 +51,7 @@ jobs:
 
   test-unit:
     needs: prepare-matrix
-    timeout-minutes: 20
+    timeout-minutes: 60  # macos tests are very slow
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -137,10 +137,11 @@ jobs:
         run: echo $PKG_CONFIG_PATH && make test-integration
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         env:
           OS: ${{ runner.os }}
           python: ${{ matrix.python-version }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           env_vars: OS, python
+          version: v0.7.3  # workaround on Intel macs (GH Actions)