From 1f4331e78bb6ff3967dd4c985239a487071a3cb6 Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Mon, 15 Apr 2024 14:30:23 -0700
Subject: [PATCH 1/6] Add the `rust-alias` variable so that workflow names
 won't change with future MSRV bumps

---
 .github/workflows/ci.yaml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index cf289a66..1770bb30 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,17 +10,22 @@ env:
 
 jobs:
   build_and_test:
-    name: Build and test
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        rust: [stable, '1.70', nightly]
-
+        include:
+        - rust-alias: stable
+          rust: stable
+        - rust-alias: msrv
+          rust: '1.70'
+        - rust-alias: nightly
+          rust: nightly
+    name: Build and test (${{ matrix.os }}, ${{ matrix.rust-alias}})
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@master
 
-    - name: Install ${{ matrix.rust }}
+    - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
         toolchain: ${{ matrix.rust }}

From 48723bfdb05f0baed63d6ef7b994d24246a3ac3e Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Mon, 15 Apr 2024 14:32:15 -0700
Subject: [PATCH 2/6] Bug fix?

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1770bb30..30530c9f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
           rust: '1.70'
         - rust-alias: nightly
           rust: nightly
-    name: Build and test (${{ matrix.os }}, ${{ matrix.rust-alias}})
+    name: Build and test (${{ matrix.os }}, ${{ matrix.rust-alias }})
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@master

From a76a6c90538de3e60b3e9926b9df87da9492cb9a Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Mon, 15 Apr 2024 14:33:35 -0700
Subject: [PATCH 3/6] Bug fix? Remove hyphen from `rustalias`

---
 .github/workflows/ci.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 30530c9f..9c91503b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,13 +14,13 @@ jobs:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
         include:
-        - rust-alias: stable
+        - rustalias: stable
           rust: stable
-        - rust-alias: msrv
+        - rustalias: msrv
           rust: '1.70'
-        - rust-alias: nightly
+        - rustalias: nightly
           rust: nightly
-    name: Build and test (${{ matrix.os }}, ${{ matrix.rust-alias }})
+    name: Build and test (${{ matrix.os }}, ${{ matrix.rustalias }})
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@master

From 7e2ccf44a5538569718e9f226b897171fecf1968 Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Mon, 15 Apr 2024 14:38:50 -0700
Subject: [PATCH 4/6] Bug fix? Use a singleton matrix dimension to force
 `include` to overlap

---
 .github/workflows/ci.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9c91503b..0c641b9c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,12 +13,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
+        singleton: [1]
         include:
-        - rustalias: stable
+        - singleton: 1
+          rustalias: stable
           rust: stable
-        - rustalias: msrv
+        - singleton: 1
+          rustalias: msrv
           rust: '1.70'
-        - rustalias: nightly
+        - singleton: 1
+          rustalias: nightly
           rust: nightly
     name: Build and test (${{ matrix.os }}, ${{ matrix.rustalias }})
     runs-on: ${{ matrix.os }}

From 9580814d742d8272cb4c19775c065a63181b4c0b Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Mon, 15 Apr 2024 14:48:45 -0700
Subject: [PATCH 5/6] Bug fix? Put combined name in quotes

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0c641b9c..a481b109 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -24,7 +24,7 @@ jobs:
         - singleton: 1
           rustalias: nightly
           rust: nightly
-    name: Build and test (${{ matrix.os }}, ${{ matrix.rustalias }})
+    name: 'Build and test: ${{ matrix.os }}, ${{ matrix.rustalias }}'
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@master

From 4777dbe5f88f7dcc7218881445a1e7cd38dcefd2 Mon Sep 17 00:00:00 2001
From: Chris Hennick <hennickc@amazon.com>
Date: Mon, 15 Apr 2024 14:50:48 -0700
Subject: [PATCH 6/6] Bug fix? Define all `rustalias` values in outer tag so
 that it's not a product join

---
 .github/workflows/ci.yaml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a481b109..e6c474e9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,16 +13,13 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        singleton: [1]
+        rustalias: [stable, nightly, msrv]
         include:
-        - singleton: 1
-          rustalias: stable
+        - rustalias: stable
           rust: stable
-        - singleton: 1
-          rustalias: msrv
+        - rustalias: msrv
           rust: '1.70'
-        - singleton: 1
-          rustalias: nightly
+        - rustalias: nightly
           rust: nightly
     name: 'Build and test: ${{ matrix.os }}, ${{ matrix.rustalias }}'
     runs-on: ${{ matrix.os }}