From 38051730a07a9cb244c484b3070662824b26cb40 Mon Sep 17 00:00:00 2001
From: Jay Herron <NeedleInAJayStack@protonmail.com>
Date: Sat, 3 Oct 2026 22:43:58 -0600
Subject: [PATCH 1/3] feat: MacOS uses `swift-actions` and includes a version
 matrix

---
 .github/workflows/test.yaml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index efd5af6..dc1b92e 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -18,12 +18,18 @@ env:
 
 jobs:
   macos:
-    name: Test on macOS
+    name: Test on macOS - ${{ matrix.swift-version }}
     runs-on: macos-latest
+    strategy:
+      matrix:
+        swift-version:
+          - "6.2"
+          - "6.3"
+          - "6.4"
     steps:
-    - uses: maxim-lobanov/setup-xcode@v1
+    - uses: swift-actions/setup-swift@v3
       with:
-        xcode-version: latest-stable
+        swift-version: ${{ matrix.swift-version }}
     - uses: actions/checkout@v4
     - name: Build and test
       run: |
@@ -33,13 +39,13 @@ jobs:
 
   linux:
     name: Test on Linux - ${{ matrix.swift-image }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         swift-image:
           - "swift:6.2"
           - "swift:6.3"
           - "swift:6.4"
-    runs-on: ubuntu-latest
     container: ${{ matrix.swift-image }}
     steps:
     - name: Checkout

From 24f48681eb7a09ac6f8eecdeae69db55e409bbf6 Mon Sep 17 00:00:00 2001
From: Jay Herron <NeedleInAJayStack@protonmail.com>
Date: Sat, 3 Oct 2026 22:44:53 -0600
Subject: [PATCH 2/3] refactor: Remove `--parallel` because swift testing is
 parallel by default

---
 .github/workflows/test.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index dc1b92e..e98d250 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -34,7 +34,6 @@ jobs:
     - name: Build and test
       run: |
         swift test \
-          --parallel \
           ${{ inputs.package_path != '' && format('--package-path={0}', inputs.package_path) || '' }}
 
   linux:
@@ -53,7 +52,6 @@ jobs:
     - name: Test
       run: |
         swift test \
-          --parallel \
           ${{ inputs.package_path != '' && format('--package-path={0}', inputs.package_path) || '' }}
 
   android:

From 7a1f97df30a05866288d8178c9a3aa61ce160977 Mon Sep 17 00:00:00 2001
From: Jay Herron <NeedleInAJayStack@protonmail.com>
Date: Sat, 3 Oct 2026 22:53:24 -0600
Subject: [PATCH 3/3] refactor: Convert Linux matrix to just tag

---
 .github/workflows/test.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index e98d250..bbd5243 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -37,15 +37,15 @@ jobs:
           ${{ inputs.package_path != '' && format('--package-path={0}', inputs.package_path) || '' }}
 
   linux:
-    name: Test on Linux - ${{ matrix.swift-image }}
+    name: Test on Linux - ${{ matrix.swift-tag }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        swift-image:
-          - "swift:6.2"
-          - "swift:6.3"
-          - "swift:6.4"
-    container: ${{ matrix.swift-image }}
+        swift-tag:
+          - "6.2"
+          - "6.3"
+          - "6.4"
+    container: "swift:${{ matrix.swift-tag }}"
     steps:
     - name: Checkout
       uses: actions/checkout@v4