better ci script

thorek1 · Dec 30, 2023 · 445e977 · 445e977
1 parent 39807d6
commit 445e977
Showing 1 changed file with 15 additions and 40 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,56 +9,31 @@ jobs:
       GKSwstype: "nul"
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.version == 'nightly' || matrix.version == '^1.10.0-0' }}
+    continue-on-error: ${{ matrix.version == 'nightly' || matrix.version == '^1.11.0-0' }}
     strategy:
       fail-fast: false
       matrix:
-        version:
-          - '1.10' #^1-0 and ^1.9-0 are not recognised
-        os:
-          - ubuntu-latest
-          - macOS-latest
-          - windows-latest
-        arch:
-          - x64
-        test_set:
-          - "estimation"
-          - "higher_order_estimation"
-          - "higher_order"
-          - "plots"
-          - "basic"
+        version: ['1.8', '1.9', '1.10']
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        arch: [x64]
+        test_set: ["estimation", "higher_order_estimation", "higher_order", "plots", "basic"]
+        exclude:
+          - version: '1.8'
+            os: [macOS-latest, windows-latest]
+          - version: '1.9'
+            os: [macOS-latest, windows-latest]
+          - version: '1.10'
+            os: [macOS-latest, windows-latest]
+            test_set: ["estimation", "higher_order_estimation", "higher_order"]
         include:
           - os: ubuntu-latest
             prefix: xvfb-run
-          - version: '1.8'
-            os: ubuntu-latest
-            arch: x64
-            test_set: "basic"
-          - version: '1.8'
-            os: ubuntu-latest
-            arch: x64
-            test_set: "plots"
-          - version: '1.9'
-            os: ubuntu-latest
-            arch: x64
-            test_set: "estimation"
-            allow_failure: true
-          - version: '1.9'
-            os: ubuntu-latest
-            arch: x64
-            test_set: "higher_order"
-            allow_failure: true
-          - version: '1.9'
-            os: ubuntu-latest
-            arch: x64
-            test_set: "plots"
-            allow_failure: true
-          - version: '1.9'
+          - version: 'nightly'
             os: ubuntu-latest
             arch: x64
             test_set: "basic"
             allow_failure: true
-          - version: 'nightly'
+          - version: '^1.11.0-0'
             os: ubuntu-latest
             arch: x64
             test_set: "basic"