From f0e1118719e029c9be258beedd1cf1104c6638d8 Mon Sep 17 00:00:00 2001
From: Jonathan Johnson <jon@khonsulabs.com>
Date: Mon, 1 Jan 2024 13:39:48 -0800
Subject: [PATCH] Switching test CI to a matrix

Also adding Mac
---
 .github/workflows/rust.yml | 42 ++++++++------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 5b8b06c..744b99e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -4,55 +4,29 @@ on: [push]
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: ["stable", "1.70.0"]
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
 
       - name: Install x11 dependencies for Kludgine
+        if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update -y -qq
           sudo add-apt-repository ppa:oibaf/graphics-drivers -y
           sudo apt-get update
           sudo apt-get install -y \
             libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@${{ matrix.version }}
 
       - name: Run clippy
+        if: matrix.version == 'stable'
         run: |
           cargo clippy --all-features --all-targets
 
       - name: Run default features unit tests
         run: |
           cargo test --all-features --all-targets
-
-  test-msrv:
-    name: Test on MSRV
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install x11 dependencies for Kludgine
-        run: |
-          sudo apt-get update -y -qq
-          sudo add-apt-repository ppa:oibaf/graphics-drivers -y
-          sudo apt-get update
-          sudo apt-get install -y \
-            libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
-
-      - uses: dtolnay/rust-toolchain@1.70.0
-
-      - name: Run default features unit tests
-        run: |
-          cargo test --all-features --all-targets
-
-  test-windows:
-    name: Test on MSRV
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: dtolnay/rust-toolchain@stable
-
-      - name: Run default features unit tests
-        run: |
-          cargo test --all-features --all-targets