This should be the matrix we want?

Should be 3 release console builds 2 release vis builds 1 beltsoff build per os.
FLAMEGPU · Nov 1, 2023 · e484459 · e484459
1 parent af303d9
commit e484459
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml
@@ -33,10 +33,10 @@ jobs:
             cuda_arch: "50"
             hostcxx: gcc-12
             os: ubuntu-22.04
-          # - cuda: "11.8"
-          #   cuda_arch: "35"
-          #   hostcxx: gcc-11
-          #   os: ubuntu-22.04
+          - cuda: "11.8"
+            cuda_arch: "35"
+            hostcxx: gcc-11
+            os: ubuntu-22.04
           - cuda: "11.0"
             cuda_arch: "35"
             hostcxx: gcc-8
@@ -47,25 +47,29 @@ jobs:
           - name: "Release"
             config: "Release"
             SEATBELTS: "ON"
-          - name: "BeltsOff"
+          - name: "Beltsoff"
             config: "Release"
             SEATBELTS: "OFF"
         VISUALISATION: 
           - "ON"
           - "OFF"
         exclude:
-          # Exclude VIS=ON for old cuda's.
+          # Exclude VIS=ON for oldest cuda.
           - cudacxx:
               cuda: "11.0"
             VISUALISATION: "ON"
           # Exclude beltsoff builds for old cuda's
+          - cudacxx:
+              cuda: "11.8"
+            config:
+              name: "Beltsoff"
           - cudacxx:
               cuda: "11.0"
             config:
-              name: "BeltsOff"
-          # Exclude beltsoff vis builds for old cuda's
+              name: "Beltsoff"
+          # Exclude beltsoff vis builds to keep the matrix lighter.
           - config:
-              name: "BeltsOff"
+              name: "Beltsoff"
             VISUALISATION: "ON"
 
     # Name the job based on matrix/env options

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -47,28 +47,29 @@ jobs:
           - name: "Release"
             config: "Release"
             SEATBELTS: "ON"
+          - name: "Beltsoff"
+            config: "Release"
+            SEATBELTS: "OFF"
         VISUALISATION: 
           - "ON"
           - "OFF"
-
-        include:
+        exclude:
+          # Exclude VIS=ON for oldest cuda.
           - cudacxx:
-            - cuda: "12.3.0"
-              cuda_arch: "50"
-              hostcxx: "Visual Studio 17 2022"
-              os: windows-2022
-            python: 
-              - "3.12"
+              cuda: "11.0.3"
+            VISUALISATION: "ON"
+          # Exclude beltsoff builds for old cuda's
+          - cudacxx:
+              cuda: "11.8.0"
             config:
-              - name: "SeatbeltsOff"
-                config: "Release"
-                SEATBELTS: "OFF"
-            VISUALISATION: "OFF"
-
-        exclude:
-          # Exclude VIS=ON for old cuda's.
+              name: "Beltsoff"
           - cudacxx:
               cuda: "11.0.3"
+            config:
+              name: "Beltsoff"
+          # Exclude beltsoff vis builds to keep the matrix lighter.
+          - config:
+              name: "Beltsoff"
             VISUALISATION: "ON"
 
     # Name the job based on matrix/env options