From b7e02fbd8af06d80b4ad22b033508d04d23bd05d Mon Sep 17 00:00:00 2001
From: Sergio Benitez <sb@sergio.bz>
Date: Thu, 11 Apr 2024 18:27:43 -0700
Subject: [PATCH] Only make contrib nightly CI fallible.

---
 .github/workflows/ci.yml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6a8dadbc1..a6258ef531 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,30 +13,39 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        fallible: [false]
         platform:
           - { name: Linux, distro: ubuntu-latest, toolchain: stable }
           - { name: Windows, distro: windows-latest, toolchain: stable }
           - { name: macOS, distro: macOS-latest, toolchain: stable }
-          - { name: Linux, distro: ubuntu-latest, toolchain: nightly }
         test:
-          - { name: Debug, flag: }
+          - { name: Debug }
           - { name: Contrib, flag: "--contrib" }
           - { name: Examples, flag: "--examples" }
         include:
-          - platform: { name: Linux, distro: ubuntu-latest, toolchain: nightly }
+          # Additional tests on Linux/stable.
+          - platform: { name: Linux, distro: ubuntu-latest, toolchain: stable }
             test: { name: Core, flag: "--core" }
-            fallible: true
           - platform: { name: Linux, distro: ubuntu-latest, toolchain: stable }
             test: { name: Release, flag: "--release" }
           - platform: { name: Linux, distro: ubuntu-latest, toolchain: stable }
             test: { name: UI, flag: "--ui" }
             fallible: true
+
+          # Additional tests on Linux/nightly.
           - platform: { name: Linux, distro: ubuntu-latest, toolchain: nightly }
-            test: { name: UI, flag: "--ui" }
+            test: { name: Debug }
+          - platform: { name: Linux, distro: ubuntu-latest, toolchain: nightly }
+            test: { name: Core, flag: "--core" }
+          - platform: { name: Linux, distro: ubuntu-latest, toolchain: nightly }
+            test: { name: Examples, flag: "--examples" }
+          - platform: { name: Linux, distro: ubuntu-latest, toolchain: nightly }
+            test: { name: Contrib, flag: "--contrib" }
             fallible: true
+
+          # Use the bigger 'C:/' from the "Switch Disk" step
           - platform: { name: Windows }
-            working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
+            working-directory:
+              "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}"
 
     steps:
       - name: Checkout Sources
@@ -112,7 +121,7 @@ jobs:
           Get-PSDrive
 
       - name: Run Tests
-        continue-on-error: ${{ matrix.fallible }}
+        continue-on-error: ${{ matrix.fallible || false }}
         working-directory: ${{ matrix.working-directory || github.workspace }}
-        run: ./scripts/test.sh ${{ matrix.test.flag }} -q
+        run: ./scripts/test.sh ${{ matrix.test.flag || '' }} -q
         shell: bash