Refactor CI matrix

Author: penelopeysm

.github/workflows/Tests.yml

@@ -11,7 +11,7 @@ jobs:
     # Use matrix.test.name here to avoid it taking up the entire window width
     name: test ${{matrix.test.name}} (${{ matrix.os }}, ${{ matrix.version }}, ${{ matrix.arch }}, ${{ matrix.num_threads }})
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.version == 'nightly' }}
+    continue-on-error: ${{ matrix.version == 'dev' }}
 
     strategy:
       fail-fast: false
@@ -36,38 +36,22 @@ jobs:
           - name: "everything else"
             args: "--skip essential/ad.jl mcmc/gibbs.jl mcmc/hmc.jl mcmc/abstractmcmc.jl mcmc/Inference.jl experimental/gibbs.jl mcmc/ess.jl"
         version:
-          - '1.10'
           - '1'
         os:
           - ubuntu-latest
-          - windows-latest
-          - macOS-latest
         arch:
           - x64
-          - x86
         num_threads:
           - 1
-          - 2
-        exclude:
-          # With Windows and macOS, only run x64, 2 threads. We just want to see
-          # some combination work on OSes other than Ubuntu.
-          - os: windows-latest
-            version: '1'
-          - os: macOS-latest
-            version: '1'
-          - os: windows-latest
-            arch: x86
-          - os: macOS-latest
-            arch: x86
+
+        # Extra combinations to test
+        include:
+          - arch: x86
+          - num_threads: 2
           - os: windows-latest
-            num_threads: 1
           - os: macOS-latest
-            num_threads: 1
-          # It's sufficient to test x86 with only Julia 1.10 and 1 thread.
-          - arch: x86
-            version: '1'
-          - arch: x86
-            num_threads: 2
+          - version: 'min'
+          - version: 'dev'
 
     steps:
       - name: Print matrix variables