From 33ac15c6bbc981caaca699a5dc6d595e4bba9f05 Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 00:05:53 -0700
Subject: [PATCH 01/12] test

---
 .github/workflows/test.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1f34d171f7..04e43c3fe1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,35 +14,46 @@ on:
 
 jobs:
   check:
-    runs-on: windows-2022
-
     strategy:
       matrix:
         include:
           - version: stable
             host: x86_64-pc-windows-msvc
             target: x86_64-pc-windows-msvc
+            runner: windows-2022
             etc:
           - version: nightly
             host: x86_64-pc-windows-msvc
             target: i686-pc-windows-msvc
+            runner: windows-2022
             etc:
           - version: nightly
             host: x86_64-pc-windows-gnu
             target: x86_64-pc-windows-gnu
+            runner: windows-2022
             etc:
           - version: stable
             host: x86_64-pc-windows-gnu
             target: i686-pc-windows-gnu
+            runner: windows-2022
             etc:
           - version: stable
             host: x86_64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
+            runner: windows-2022
             etc: --no-run
           - version: nightly
             host: x86_64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
+            runner: windows-2022
             etc: --no-run
+          - version: nightly
+            host: aarch64-pc-windows-msvc
+            target: aarch64-pc-windows-msvc
+            runner: windows-11-arm
+            etc:
+            
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout

From 3116c7dc6ed8a297878c08dc5518e12b75c4114a Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 00:09:30 -0700
Subject: [PATCH 02/12] tool_yml

---
 crates/tools/yml/src/test.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/tools/yml/src/test.rs b/crates/tools/yml/src/test.rs
index d980ef7d74..173848ed99 100644
--- a/crates/tools/yml/src/test.rs
+++ b/crates/tools/yml/src/test.rs
@@ -47,6 +47,11 @@ jobs:
             host: x86_64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
             etc: --no-run
+          - version: nightly
+            host: aarch64-pc-windows-msvc
+            target: aarch64-pc-windows-msvc
+            runner: windows-11-arm
+            etc:
 
     steps:
       - name: Checkout

From bcc1f3043bbcbb7a4d3e38d4a7e223c3da8384cd Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 00:10:19 -0700
Subject: [PATCH 03/12] variable name

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 04e43c3fe1..f1fa53b969 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -53,7 +53,7 @@ jobs:
             runner: windows-11-arm
             etc:
             
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.runner }}
 
     steps:
       - name: Checkout

From 7cf2279c7549b6b1b9ca9b701ba8436c0f0313cf Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 00:13:16 -0700
Subject: [PATCH 04/12] tool_yml

---
 .github/workflows/test.yml   |  2 +-
 crates/tools/yml/src/test.rs | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f1fa53b969..6bab84fac5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -52,7 +52,7 @@ jobs:
             target: aarch64-pc-windows-msvc
             runner: windows-11-arm
             etc:
-            
+
     runs-on: ${{ matrix.runner }}
 
     steps:
diff --git a/crates/tools/yml/src/test.rs b/crates/tools/yml/src/test.rs
index 173848ed99..17e858e2fe 100644
--- a/crates/tools/yml/src/test.rs
+++ b/crates/tools/yml/src/test.rs
@@ -18,34 +18,38 @@ on:
 
 jobs:
   check:
-    runs-on: windows-2022
-
     strategy:
       matrix:
         include:
           - version: stable
             host: x86_64-pc-windows-msvc
             target: x86_64-pc-windows-msvc
+            runner: windows-2022
             etc:
           - version: nightly
             host: x86_64-pc-windows-msvc
             target: i686-pc-windows-msvc
+            runner: windows-2022
             etc:
           - version: nightly
             host: x86_64-pc-windows-gnu
             target: x86_64-pc-windows-gnu
+            runner: windows-2022
             etc:
           - version: stable
             host: x86_64-pc-windows-gnu
             target: i686-pc-windows-gnu
+            runner: windows-2022
             etc:
           - version: stable
             host: x86_64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
+            runner: windows-2022
             etc: --no-run
           - version: nightly
             host: x86_64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
+            runner: windows-2022
             etc: --no-run
           - version: nightly
             host: aarch64-pc-windows-msvc
@@ -53,6 +57,8 @@ jobs:
             runner: windows-11-arm
             etc:
 
+    runs-on: ${{ matrix.runner }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From b1202157eeb816cfa6f3063610740c3a2003366b Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 00:37:09 -0700
Subject: [PATCH 05/12] rustup

---
 .github/workflows/test.yml   | 13 +++++++++++++
 crates/tools/yml/src/test.rs | 17 +++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6bab84fac5..2e19bcccb1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -58,6 +58,19 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Install Rustup
+        shell: pwsh
+        run: |
+          Invoke-WebRequest -Uri "https://win.rustup.rs/aarch64" -OutFile rustup-init.exe
+           & .\rustup-init.exe --default-toolchain none --profile=minimal -y
+          "$env:USERPROFILE\.cargo\bin" | Out-File -Append -Encoding ascii $env:GITHUB_PATH
+          "CARGO_HOME=$env:USERPROFILE\.cargo" | Out-File -Append -Encoding ascii $env:GITHUB_ENV
+        if: ${{ matrix.runner == 'windows-11-arm' }}
+      - name: Install Rust tools
+        shell: pwsh
+        run: |
+          rustup component add rustfmt clippy
+        if: ${{ matrix.runner == 'windows-11-arm' }}
       - name: Update toolchain
         run: rustup update --no-self-update ${{ matrix.version }} && rustup default ${{ matrix.version }}-${{ matrix.host }}
       - name: Add toolchain target
diff --git a/crates/tools/yml/src/test.rs b/crates/tools/yml/src/test.rs
index 17e858e2fe..0f1a8e392b 100644
--- a/crates/tools/yml/src/test.rs
+++ b/crates/tools/yml/src/test.rs
@@ -2,7 +2,7 @@ use super::*;
 
 pub fn yml() {
     let mut yml =
-        r"name: test
+        r#"name: test
 
 on:
   pull_request:
@@ -62,6 +62,19 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Install Rustup
+        shell: pwsh
+        run: |
+          Invoke-WebRequest -Uri "https://win.rustup.rs/aarch64" -OutFile rustup-init.exe
+           & .\rustup-init.exe --default-toolchain none --profile=minimal -y
+          "$env:USERPROFILE\.cargo\bin" | Out-File -Append -Encoding ascii $env:GITHUB_PATH
+          "CARGO_HOME=$env:USERPROFILE\.cargo" | Out-File -Append -Encoding ascii $env:GITHUB_ENV
+        if: ${{ matrix.runner == 'windows-11-arm' }}
+      - name: Install Rust tools
+        shell: pwsh
+        run: |
+          rustup component add rustfmt clippy
+        if: ${{ matrix.runner == 'windows-11-arm' }}
       - name: Update toolchain
         run: rustup update --no-self-update ${{ matrix.version }} && rustup default ${{ matrix.version }}-${{ matrix.host }}
       - name: Add toolchain target
@@ -69,7 +82,7 @@ jobs:
       - name: Install fmt
         run: rustup component add rustfmt
       - name: Fix environment
-        uses: ./.github/actions/fix-environment"
+        uses: ./.github/actions/fix-environment"#
     .to_string();
 
     // This unrolling is required since "cargo test --all" consumes too much memory for the GitHub hosted runners

From e474536d1abeb51c9ce223b8d54ccc958e77aec3 Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 00:41:12 -0700
Subject: [PATCH 06/12] clippy

---
 .github/workflows/test.yml   | 9 ++-------
 crates/tools/yml/src/test.rs | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2e19bcccb1..e102368c2b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,17 +66,12 @@ jobs:
           "$env:USERPROFILE\.cargo\bin" | Out-File -Append -Encoding ascii $env:GITHUB_PATH
           "CARGO_HOME=$env:USERPROFILE\.cargo" | Out-File -Append -Encoding ascii $env:GITHUB_ENV
         if: ${{ matrix.runner == 'windows-11-arm' }}
-      - name: Install Rust tools
-        shell: pwsh
-        run: |
-          rustup component add rustfmt clippy
-        if: ${{ matrix.runner == 'windows-11-arm' }}
       - name: Update toolchain
         run: rustup update --no-self-update ${{ matrix.version }} && rustup default ${{ matrix.version }}-${{ matrix.host }}
       - name: Add toolchain target
         run: rustup target add ${{ matrix.target }}
-      - name: Install fmt
-        run: rustup component add rustfmt
+      - name: Install fmt, clippy
+        run: rustup component add clippy rustfmt
       - name: Fix environment
         uses: ./.github/actions/fix-environment
       - name: Clean
diff --git a/crates/tools/yml/src/test.rs b/crates/tools/yml/src/test.rs
index 0f1a8e392b..256c94e3af 100644
--- a/crates/tools/yml/src/test.rs
+++ b/crates/tools/yml/src/test.rs
@@ -70,17 +70,12 @@ jobs:
           "$env:USERPROFILE\.cargo\bin" | Out-File -Append -Encoding ascii $env:GITHUB_PATH
           "CARGO_HOME=$env:USERPROFILE\.cargo" | Out-File -Append -Encoding ascii $env:GITHUB_ENV
         if: ${{ matrix.runner == 'windows-11-arm' }}
-      - name: Install Rust tools
-        shell: pwsh
-        run: |
-          rustup component add rustfmt clippy
-        if: ${{ matrix.runner == 'windows-11-arm' }}
       - name: Update toolchain
         run: rustup update --no-self-update ${{ matrix.version }} && rustup default ${{ matrix.version }}-${{ matrix.host }}
       - name: Add toolchain target
         run: rustup target add ${{ matrix.target }}
-      - name: Install fmt
-        run: rustup component add rustfmt
+      - name: Install fmt, clippy
+        run: rustup component add clippy rustfmt
       - name: Fix environment
         uses: ./.github/actions/fix-environment"#
     .to_string();

From 33ea2112a481b146e8a8b818d4aa24a118bbd15c Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 00:49:48 -0700
Subject: [PATCH 07/12] mingw

---
 .github/actions/fix-environment/action.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actions/fix-environment/action.yml b/.github/actions/fix-environment/action.yml
index 68d2f48c0d..f35581ada9 100644
--- a/.github/actions/fix-environment/action.yml
+++ b/.github/actions/fix-environment/action.yml
@@ -41,8 +41,8 @@ runs:
           }
           "aarch64*"
           {
-            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH
-            ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\x64")
+            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22000.0\arm64" >> $env:GITHUB_PATH
+            ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\arm64")
               | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
           }
           "*"
@@ -64,3 +64,4 @@ runs:
         C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-llvm
         C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-i686-gcc
         C:\msys64\usr\bin\pacman.exe --sync --refresh --noconfirm mingw-w64-x86_64-gcc
+      if: ${{ !contains(matrix.runner, 'windows-11-arm') }}

From a2a409467378dcf757284c5da7ab41c9c5b4b51f Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 01:17:40 -0700
Subject: [PATCH 08/12] windows sdk

---
 .github/actions/fix-environment/action.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/actions/fix-environment/action.yml b/.github/actions/fix-environment/action.yml
index f35581ada9..45ae2d4735 100644
--- a/.github/actions/fix-environment/action.yml
+++ b/.github/actions/fix-environment/action.yml
@@ -29,19 +29,19 @@ runs:
           }
           "i686*"
           {
-            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22000.0\x86" >> $env:GITHUB_PATH
+            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\x86" >> $env:GITHUB_PATH
             ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx86\x86")
               | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
           }
           "x86_64*"
           {
-            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH
+            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\x64" >> $env:GITHUB_PATH
             ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\x64")
               | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
           }
           "aarch64*"
           {
-            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22000.0\arm64" >> $env:GITHUB_PATH
+            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\arm64" >> $env:GITHUB_PATH
             ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\arm64")
               | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
           }
@@ -49,7 +49,7 @@ runs:
           {
             (Join-Path $env:GITHUB_WORKSPACE "target\debug\deps").ToString() >> $env:GITHUB_PATH
             (Join-Path $env:GITHUB_WORKSPACE "target\test\debug\deps").ToString() >> $env:GITHUB_PATH
-            "INCLUDE=${env:ProgramFiles(x86)}\Windows Kits\10\include\10.0.22000.0\winrt;${env:ProgramFiles(x86)}\Windows Kits\10\include\10.0.22000.0\cppwinrt" `
+            "INCLUDE=${env:ProgramFiles(x86)}\Windows Kits\10\include\10.0.26100.0\winrt;${env:ProgramFiles(x86)}\Windows Kits\10\include\10.0.26100.0\cppwinrt" `
               >> $env:GITHUB_ENV
           }
         }

From 90657d1aebba0d9cbf2d1f7dbee1ce73223bb983 Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 01:31:17 -0700
Subject: [PATCH 09/12] environment

---
 .github/actions/fix-environment/action.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/actions/fix-environment/action.yml b/.github/actions/fix-environment/action.yml
index 45ae2d4735..5e997601e2 100644
--- a/.github/actions/fix-environment/action.yml
+++ b/.github/actions/fix-environment/action.yml
@@ -41,9 +41,16 @@ runs:
           }
           "aarch64*"
           {
-            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\arm64" >> $env:GITHUB_PATH
-            ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\arm64")
-              | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
+            if ("${{ matrix.runner }}" -eq "windows-11-arm") {
+              "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\arm64" >> $env:GITHUB_PATH
+              ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\arm64")
+                | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
+            } else {
+              "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\x64" >> $env:GITHUB_PATH
+              ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\x64")
+                | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
+            }
+
           }
           "*"
           {

From f2bf27803f97cbd8247474fb4f38f40d6d47eced Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 09:01:37 -0700
Subject: [PATCH 10/12] rustup

---
 .github/workflows/test.yml   | 4 ++--
 crates/tools/yml/src/test.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e102368c2b..f6f0e740f4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -61,8 +61,8 @@ jobs:
       - name: Install Rustup
         shell: pwsh
         run: |
-          Invoke-WebRequest -Uri "https://win.rustup.rs/aarch64" -OutFile rustup-init.exe
-           & .\rustup-init.exe --default-toolchain none --profile=minimal -y
+          Invoke-WebRequest -Uri "https://win.rustup.rs/aarch64" -OutFile "$env:TEMP\rustup-init.exe"
+           & "$env:TEMP\rustup-init.exe" --default-toolchain none --profile=minimal -y
           "$env:USERPROFILE\.cargo\bin" | Out-File -Append -Encoding ascii $env:GITHUB_PATH
           "CARGO_HOME=$env:USERPROFILE\.cargo" | Out-File -Append -Encoding ascii $env:GITHUB_ENV
         if: ${{ matrix.runner == 'windows-11-arm' }}
diff --git a/crates/tools/yml/src/test.rs b/crates/tools/yml/src/test.rs
index 256c94e3af..cb95398c18 100644
--- a/crates/tools/yml/src/test.rs
+++ b/crates/tools/yml/src/test.rs
@@ -65,8 +65,8 @@ jobs:
       - name: Install Rustup
         shell: pwsh
         run: |
-          Invoke-WebRequest -Uri "https://win.rustup.rs/aarch64" -OutFile rustup-init.exe
-           & .\rustup-init.exe --default-toolchain none --profile=minimal -y
+          Invoke-WebRequest -Uri "https://win.rustup.rs/aarch64" -OutFile "$env:TEMP\rustup-init.exe"
+           & "$env:TEMP\rustup-init.exe" --default-toolchain none --profile=minimal -y
           "$env:USERPROFILE\.cargo\bin" | Out-File -Append -Encoding ascii $env:GITHUB_PATH
           "CARGO_HOME=$env:USERPROFILE\.cargo" | Out-File -Append -Encoding ascii $env:GITHUB_ENV
         if: ${{ matrix.runner == 'windows-11-arm' }}

From 97baf8d6f7e1a02ebb6db79cd181511f2c5a5719 Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 10:46:40 -0700
Subject: [PATCH 11/12] cleanup

---
 .github/actions/fix-environment/action.yml | 13 +++----------
 .github/workflows/test.yml                 | 10 ----------
 crates/tools/yml/src/test.rs               | 10 ----------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/.github/actions/fix-environment/action.yml b/.github/actions/fix-environment/action.yml
index 5e997601e2..45ae2d4735 100644
--- a/.github/actions/fix-environment/action.yml
+++ b/.github/actions/fix-environment/action.yml
@@ -41,16 +41,9 @@ runs:
           }
           "aarch64*"
           {
-            if ("${{ matrix.runner }}" -eq "windows-11-arm") {
-              "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\arm64" >> $env:GITHUB_PATH
-              ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\arm64")
-                | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
-            } else {
-              "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\x64" >> $env:GITHUB_PATH
-              ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\x64")
-                | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
-            }
-
+            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.26100.0\arm64" >> $env:GITHUB_PATH
+            ((Resolve-Path "$vs_root\VC\Tools\MSVC\*\bin\Hostx64\arm64")
+              | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
           }
           "*"
           {
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f6f0e740f4..0e17c7364f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,16 +38,6 @@ jobs:
             runner: windows-2022
             etc:
           - version: stable
-            host: x86_64-pc-windows-msvc
-            target: aarch64-pc-windows-msvc
-            runner: windows-2022
-            etc: --no-run
-          - version: nightly
-            host: x86_64-pc-windows-msvc
-            target: aarch64-pc-windows-msvc
-            runner: windows-2022
-            etc: --no-run
-          - version: nightly
             host: aarch64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
             runner: windows-11-arm
diff --git a/crates/tools/yml/src/test.rs b/crates/tools/yml/src/test.rs
index cb95398c18..67e1d7a707 100644
--- a/crates/tools/yml/src/test.rs
+++ b/crates/tools/yml/src/test.rs
@@ -42,16 +42,6 @@ jobs:
             runner: windows-2022
             etc:
           - version: stable
-            host: x86_64-pc-windows-msvc
-            target: aarch64-pc-windows-msvc
-            runner: windows-2022
-            etc: --no-run
-          - version: nightly
-            host: x86_64-pc-windows-msvc
-            target: aarch64-pc-windows-msvc
-            runner: windows-2022
-            etc: --no-run
-          - version: nightly
             host: aarch64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
             runner: windows-11-arm

From 69230f6756b319bfa29c7a3147a1ad50673610a8 Mon Sep 17 00:00:00 2001
From: Rafael Rivera <rafael@withinwindows.com>
Date: Wed, 16 Apr 2025 12:22:43 -0700
Subject: [PATCH 12/12] etc

---
 .github/workflows/test.yml   | 341 +++++++++++++++++------------------
 crates/tools/yml/src/test.rs |   7 +-
 2 files changed, 169 insertions(+), 179 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0e17c7364f..a79a8f599d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,27 +21,22 @@ jobs:
             host: x86_64-pc-windows-msvc
             target: x86_64-pc-windows-msvc
             runner: windows-2022
-            etc:
           - version: nightly
             host: x86_64-pc-windows-msvc
             target: i686-pc-windows-msvc
             runner: windows-2022
-            etc:
           - version: nightly
             host: x86_64-pc-windows-gnu
             target: x86_64-pc-windows-gnu
             runner: windows-2022
-            etc:
           - version: stable
             host: x86_64-pc-windows-gnu
             target: i686-pc-windows-gnu
             runner: windows-2022
-            etc:
           - version: stable
             host: aarch64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
             runner: windows-11-arm
-            etc:
 
     runs-on: ${{ matrix.runner }}
 
@@ -67,347 +62,347 @@ jobs:
       - name: Clean
         run:  cargo clean
       - name: Test cppwinrt
-        run:  cargo test -p cppwinrt --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p cppwinrt --target ${{ matrix.target }}
       - name: Test helpers
-        run:  cargo test -p helpers --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p helpers --target ${{ matrix.target }}
       - name: Test sample_bits
-        run:  cargo test -p sample_bits --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_bits --target ${{ matrix.target }}
       - name: Test sample_com_uri
-        run:  cargo test -p sample_com_uri --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_com_uri --target ${{ matrix.target }}
       - name: Test sample_consent
-        run:  cargo test -p sample_consent --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_consent --target ${{ matrix.target }}
       - name: Test sample_core_app
-        run:  cargo test -p sample_core_app --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_core_app --target ${{ matrix.target }}
       - name: Test sample_counter
-        run:  cargo test -p sample_counter --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_counter --target ${{ matrix.target }}
       - name: Test sample_counter_sys
-        run:  cargo test -p sample_counter_sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_counter_sys --target ${{ matrix.target }}
       - name: Test sample_create_window
-        run:  cargo test -p sample_create_window --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_create_window --target ${{ matrix.target }}
       - name: Test sample_create_window_sys
-        run:  cargo test -p sample_create_window_sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_create_window_sys --target ${{ matrix.target }}
       - name: Test sample_credentials
-        run:  cargo test -p sample_credentials --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_credentials --target ${{ matrix.target }}
       - name: Test sample_data_protection
-        run:  cargo test -p sample_data_protection --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_data_protection --target ${{ matrix.target }}
       - name: Test sample_dcomp
-        run:  cargo test -p sample_dcomp --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_dcomp --target ${{ matrix.target }}
       - name: Test sample_delay_load
-        run:  cargo test -p sample_delay_load --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_delay_load --target ${{ matrix.target }}
       - name: Test sample_delay_load_sys
-        run:  cargo test -p sample_delay_load_sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_delay_load_sys --target ${{ matrix.target }}
       - name: Test sample_device_watcher
-        run:  cargo test -p sample_device_watcher --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_device_watcher --target ${{ matrix.target }}
       - name: Test sample_direct2d
-        run:  cargo test -p sample_direct2d --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_direct2d --target ${{ matrix.target }}
       - name: Test sample_direct3d12
-        run:  cargo test -p sample_direct3d12 --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_direct3d12 --target ${{ matrix.target }}
       - name: Test sample_enum_windows
-        run:  cargo test -p sample_enum_windows --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_enum_windows --target ${{ matrix.target }}
       - name: Test sample_enum_windows_sys
-        run:  cargo test -p sample_enum_windows_sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_enum_windows_sys --target ${{ matrix.target }}
       - name: Test sample_file_dialogs
-        run:  cargo test -p sample_file_dialogs --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_file_dialogs --target ${{ matrix.target }}
       - name: Test sample_json_validator
-        run:  cargo test -p sample_json_validator --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_json_validator --target ${{ matrix.target }}
       - name: Test sample_json_validator_client
-        run:  cargo test -p sample_json_validator_client --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_json_validator_client --target ${{ matrix.target }}
       - name: Test sample_json_validator_winrt
-        run:  cargo test -p sample_json_validator_winrt --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_json_validator_winrt --target ${{ matrix.target }}
       - name: Test sample_json_validator_winrt_client
-        run:  cargo test -p sample_json_validator_winrt_client --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_json_validator_winrt_client --target ${{ matrix.target }}
       - name: Test sample_json_validator_winrt_client_cpp
-        run:  cargo test -p sample_json_validator_winrt_client_cpp --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_json_validator_winrt_client_cpp --target ${{ matrix.target }}
       - name: Test sample_kernel_event
-        run:  cargo test -p sample_kernel_event --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_kernel_event --target ${{ matrix.target }}
       - name: Test sample_memory_buffer
-        run:  cargo test -p sample_memory_buffer --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_memory_buffer --target ${{ matrix.target }}
       - name: Test sample_message_box
-        run:  cargo test -p sample_message_box --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_message_box --target ${{ matrix.target }}
       - name: Test sample_message_box_sys
-        run:  cargo test -p sample_message_box_sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_message_box_sys --target ${{ matrix.target }}
       - name: Test sample_ocr
-        run:  cargo test -p sample_ocr --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_ocr --target ${{ matrix.target }}
       - name: Test sample_overlapped
-        run:  cargo test -p sample_overlapped --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_overlapped --target ${{ matrix.target }}
       - name: Test sample_privileges
-        run:  cargo test -p sample_privileges --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_privileges --target ${{ matrix.target }}
       - name: Test sample_privileges_sys
-        run:  cargo test -p sample_privileges_sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_privileges_sys --target ${{ matrix.target }}
       - name: Test sample_rss
-        run:  cargo test -p sample_rss --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_rss --target ${{ matrix.target }}
       - name: Test sample_shell
-        run:  cargo test -p sample_shell --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_shell --target ${{ matrix.target }}
       - name: Test sample_simple
-        run:  cargo test -p sample_simple --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_simple --target ${{ matrix.target }}
       - name: Test sample_spellchecker
-        run:  cargo test -p sample_spellchecker --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_spellchecker --target ${{ matrix.target }}
       - name: Test sample_task_dialog
-        run:  cargo test -p sample_task_dialog --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_task_dialog --target ${{ matrix.target }}
       - name: Test sample_task_dialog_sys
-        run:  cargo test -p sample_task_dialog_sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_task_dialog_sys --target ${{ matrix.target }}
       - name: Test sample_thread_pool_work
-        run:  cargo test -p sample_thread_pool_work --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_thread_pool_work --target ${{ matrix.target }}
       - name: Test sample_thread_pool_work_sys
-        run:  cargo test -p sample_thread_pool_work_sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_thread_pool_work_sys --target ${{ matrix.target }}
       - name: Test sample_uiautomation
-        run:  cargo test -p sample_uiautomation --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_uiautomation --target ${{ matrix.target }}
       - name: Test sample_wmi
-        run:  cargo test -p sample_wmi --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_wmi --target ${{ matrix.target }}
       - name: Test sample_xml
-        run:  cargo test -p sample_xml --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p sample_xml --target ${{ matrix.target }}
       - name: Test test_agile
-        run:  cargo test -p test_agile --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_agile --target ${{ matrix.target }}
       - name: Test test_agile_reference
-        run:  cargo test -p test_agile_reference --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_agile_reference --target ${{ matrix.target }}
       - name: Test test_alternate_success_code
-        run:  cargo test -p test_alternate_success_code --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_alternate_success_code --target ${{ matrix.target }}
       - name: Test test_arch
-        run:  cargo test -p test_arch --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_arch --target ${{ matrix.target }}
       - name: Test test_arch_feature
-        run:  cargo test -p test_arch_feature --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_arch_feature --target ${{ matrix.target }}
       - name: Clean
         run:  cargo clean
       - name: Test test_array
-        run:  cargo test -p test_array --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_array --target ${{ matrix.target }}
       - name: Test test_bcrypt
-        run:  cargo test -p test_bcrypt --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_bcrypt --target ${{ matrix.target }}
       - name: Test test_bindgen
-        run:  cargo test -p test_bindgen --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_bindgen --target ${{ matrix.target }}
       - name: Test test_calling_convention
-        run:  cargo test -p test_calling_convention --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_calling_convention --target ${{ matrix.target }}
       - name: Test test_cfg_generic
-        run:  cargo test -p test_cfg_generic --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_cfg_generic --target ${{ matrix.target }}
       - name: Test test_class_hierarchy
-        run:  cargo test -p test_class_hierarchy --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_class_hierarchy --target ${{ matrix.target }}
       - name: Test test_collection_interop
-        run:  cargo test -p test_collection_interop --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_collection_interop --target ${{ matrix.target }}
       - name: Test test_collections
-        run:  cargo test -p test_collections --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_collections --target ${{ matrix.target }}
       - name: Test test_component
-        run:  cargo test -p test_component --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_component --target ${{ matrix.target }}
       - name: Test test_component_client
-        run:  cargo test -p test_component_client --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_component_client --target ${{ matrix.target }}
       - name: Test test_composable
-        run:  cargo test -p test_composable --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_composable --target ${{ matrix.target }}
       - name: Test test_composable_client
-        run:  cargo test -p test_composable_client --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_composable_client --target ${{ matrix.target }}
       - name: Test test_const_fields
-        run:  cargo test -p test_const_fields --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_const_fields --target ${{ matrix.target }}
       - name: Test test_const_params
-        run:  cargo test -p test_const_params --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_const_params --target ${{ matrix.target }}
       - name: Test test_const_ptrs
-        run:  cargo test -p test_const_ptrs --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_const_ptrs --target ${{ matrix.target }}
       - name: Test test_constructors
-        run:  cargo test -p test_constructors --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_constructors --target ${{ matrix.target }}
       - name: Test test_constructors_client
-        run:  cargo test -p test_constructors_client --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_constructors_client --target ${{ matrix.target }}
       - name: Test test_core
-        run:  cargo test -p test_core --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_core --target ${{ matrix.target }}
       - name: Test test_debug
-        run:  cargo test -p test_debug --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_debug --target ${{ matrix.target }}
       - name: Test test_debugger_visualizer
-        run:  cargo test -p test_debugger_visualizer --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_debugger_visualizer --target ${{ matrix.target }}
       - name: Test test_deprecated
-        run:  cargo test -p test_deprecated --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_deprecated --target ${{ matrix.target }}
       - name: Test test_dispatch
-        run:  cargo test -p test_dispatch --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_dispatch --target ${{ matrix.target }}
       - name: Test test_does_not_return
-        run:  cargo test -p test_does_not_return --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_does_not_return --target ${{ matrix.target }}
       - name: Test test_ecma335
-        run:  cargo test -p test_ecma335 --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_ecma335 --target ${{ matrix.target }}
       - name: Test test_enums
-        run:  cargo test -p test_enums --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_enums --target ${{ matrix.target }}
       - name: Test test_error
-        run:  cargo test -p test_error --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_error --target ${{ matrix.target }}
       - name: Test test_event_core
-        run:  cargo test -p test_event_core --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_event_core --target ${{ matrix.target }}
       - name: Test test_events
-        run:  cargo test -p test_events --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_events --target ${{ matrix.target }}
       - name: Test test_events_client
-        run:  cargo test -p test_events_client --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_events_client --target ${{ matrix.target }}
       - name: Test test_extensions
-        run:  cargo test -p test_extensions --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_extensions --target ${{ matrix.target }}
       - name: Test test_future
-        run:  cargo test -p test_future --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_future --target ${{ matrix.target }}
       - name: Test test_handles
-        run:  cargo test -p test_handles --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_handles --target ${{ matrix.target }}
       - name: Test test_implement
-        run:  cargo test -p test_implement --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_implement --target ${{ matrix.target }}
       - name: Test test_implement_core
-        run:  cargo test -p test_implement_core --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_implement_core --target ${{ matrix.target }}
       - name: Test test_interface
-        run:  cargo test -p test_interface --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_interface --target ${{ matrix.target }}
       - name: Test test_interface_core
-        run:  cargo test -p test_interface_core --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_interface_core --target ${{ matrix.target }}
       - name: Test test_interop
-        run:  cargo test -p test_interop --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_interop --target ${{ matrix.target }}
       - name: Test test_lib
-        run:  cargo test -p test_lib --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_lib --target ${{ matrix.target }}
       - name: Test test_link
-        run:  cargo test -p test_link --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_link --target ${{ matrix.target }}
       - name: Test test_linux
-        run:  cargo test -p test_linux --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_linux --target ${{ matrix.target }}
       - name: Test test_literals
-        run:  cargo test -p test_literals --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_literals --target ${{ matrix.target }}
       - name: Test test_marshal
-        run:  cargo test -p test_marshal --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_marshal --target ${{ matrix.target }}
       - name: Test test_match
-        run:  cargo test -p test_match --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_match --target ${{ matrix.target }}
       - name: Test test_metadata
-        run:  cargo test -p test_metadata --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_metadata --target ${{ matrix.target }}
       - name: Test test_msrv
-        run:  cargo test -p test_msrv --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_msrv --target ${{ matrix.target }}
       - name: Test test_no_std
-        run:  cargo test -p test_no_std --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_no_std --target ${{ matrix.target }}
       - name: Test test_no_use
-        run:  cargo test -p test_no_use --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_no_use --target ${{ matrix.target }}
       - name: Test test_noexcept
-        run:  cargo test -p test_noexcept --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_noexcept --target ${{ matrix.target }}
       - name: Test test_not_dll
-        run:  cargo test -p test_not_dll --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_not_dll --target ${{ matrix.target }}
       - name: Test test_numerics
-        run:  cargo test -p test_numerics --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_numerics --target ${{ matrix.target }}
       - name: Clean
         run:  cargo clean
       - name: Test test_overloads
-        run:  cargo test -p test_overloads --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_overloads --target ${{ matrix.target }}
       - name: Test test_overloads_client
-        run:  cargo test -p test_overloads_client --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_overloads_client --target ${{ matrix.target }}
       - name: Test test_query_signature
-        run:  cargo test -p test_query_signature --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_query_signature --target ${{ matrix.target }}
       - name: Test test_readme
-        run:  cargo test -p test_readme --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_readme --target ${{ matrix.target }}
       - name: Test test_ref_params
-        run:  cargo test -p test_ref_params --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_ref_params --target ${{ matrix.target }}
       - name: Test test_reference
-        run:  cargo test -p test_reference --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_reference --target ${{ matrix.target }}
       - name: Test test_reference_client
-        run:  cargo test -p test_reference_client --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_reference_client --target ${{ matrix.target }}
       - name: Test test_reference_custom
-        run:  cargo test -p test_reference_custom --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_reference_custom --target ${{ matrix.target }}
       - name: Test test_reference_float
-        run:  cargo test -p test_reference_float --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_reference_float --target ${{ matrix.target }}
       - name: Test test_reference_no_deps
-        run:  cargo test -p test_reference_no_deps --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_reference_no_deps --target ${{ matrix.target }}
       - name: Test test_reference_no_windows
-        run:  cargo test -p test_reference_no_windows --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_reference_no_windows --target ${{ matrix.target }}
       - name: Test test_reference_windows
-        run:  cargo test -p test_reference_windows --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_reference_windows --target ${{ matrix.target }}
       - name: Test test_registry
-        run:  cargo test -p test_registry --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_registry --target ${{ matrix.target }}
       - name: Test test_registry_default
-        run:  cargo test -p test_registry_default --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_registry_default --target ${{ matrix.target }}
       - name: Test test_reserved
-        run:  cargo test -p test_reserved --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_reserved --target ${{ matrix.target }}
       - name: Test test_resources
-        run:  cargo test -p test_resources --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_resources --target ${{ matrix.target }}
       - name: Test test_result
-        run:  cargo test -p test_result --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_result --target ${{ matrix.target }}
       - name: Test test_return_handle
-        run:  cargo test -p test_return_handle --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_return_handle --target ${{ matrix.target }}
       - name: Test test_return_struct
-        run:  cargo test -p test_return_struct --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_return_struct --target ${{ matrix.target }}
       - name: Test test_standalone
-        run:  cargo test -p test_standalone --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_standalone --target ${{ matrix.target }}
       - name: Test test_string_param
-        run:  cargo test -p test_string_param --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_string_param --target ${{ matrix.target }}
       - name: Test test_strings
-        run:  cargo test -p test_strings --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_strings --target ${{ matrix.target }}
       - name: Test test_structs
-        run:  cargo test -p test_structs --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_structs --target ${{ matrix.target }}
       - name: Test test_sys
-        run:  cargo test -p test_sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_sys --target ${{ matrix.target }}
       - name: Test test_targets
-        run:  cargo test -p test_targets --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_targets --target ${{ matrix.target }}
       - name: Test test_unions
-        run:  cargo test -p test_unions --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_unions --target ${{ matrix.target }}
       - name: Test test_variant
-        run:  cargo test -p test_variant --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_variant --target ${{ matrix.target }}
       - name: Test test_wdk
-        run:  cargo test -p test_wdk --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_wdk --target ${{ matrix.target }}
       - name: Test test_weak
-        run:  cargo test -p test_weak --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_weak --target ${{ matrix.target }}
       - name: Test test_weak_ref
-        run:  cargo test -p test_weak_ref --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_weak_ref --target ${{ matrix.target }}
       - name: Test test_win32
-        run:  cargo test -p test_win32 --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_win32 --target ${{ matrix.target }}
       - name: Test test_win32_arrays
-        run:  cargo test -p test_win32_arrays --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_win32_arrays --target ${{ matrix.target }}
       - name: Test test_window_long
-        run:  cargo test -p test_window_long --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_window_long --target ${{ matrix.target }}
       - name: Test test_winrt
-        run:  cargo test -p test_winrt --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p test_winrt --target ${{ matrix.target }}
       - name: Test tool_bindgen
-        run:  cargo test -p tool_bindgen --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_bindgen --target ${{ matrix.target }}
       - name: Test tool_bindings
-        run:  cargo test -p tool_bindings --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_bindings --target ${{ matrix.target }}
       - name: Test tool_gnu
-        run:  cargo test -p tool_gnu --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_gnu --target ${{ matrix.target }}
       - name: Test tool_license
-        run:  cargo test -p tool_license --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_license --target ${{ matrix.target }}
       - name: Test tool_merge
-        run:  cargo test -p tool_merge --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_merge --target ${{ matrix.target }}
       - name: Test tool_msvc
-        run:  cargo test -p tool_msvc --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_msvc --target ${{ matrix.target }}
       - name: Test tool_standalone
-        run:  cargo test -p tool_standalone --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_standalone --target ${{ matrix.target }}
       - name: Test tool_test_all
-        run:  cargo test -p tool_test_all --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_test_all --target ${{ matrix.target }}
       - name: Test tool_workspace
-        run:  cargo test -p tool_workspace --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_workspace --target ${{ matrix.target }}
       - name: Test tool_yml
-        run:  cargo test -p tool_yml --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p tool_yml --target ${{ matrix.target }}
       - name: Test windows
-        run:  cargo test -p windows --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows --target ${{ matrix.target }}
       - name: Test windows-bindgen
-        run:  cargo test -p windows-bindgen --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-bindgen --target ${{ matrix.target }}
       - name: Test windows-collections
-        run:  cargo test -p windows-collections --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-collections --target ${{ matrix.target }}
       - name: Test windows-core
-        run:  cargo test -p windows-core --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-core --target ${{ matrix.target }}
       - name: Test windows-ecma335
-        run:  cargo test -p windows-ecma335 --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-ecma335 --target ${{ matrix.target }}
       - name: Test windows-future
-        run:  cargo test -p windows-future --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-future --target ${{ matrix.target }}
       - name: Clean
         run:  cargo clean
       - name: Test windows-implement
-        run:  cargo test -p windows-implement --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-implement --target ${{ matrix.target }}
       - name: Test windows-interface
-        run:  cargo test -p windows-interface --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-interface --target ${{ matrix.target }}
       - name: Test windows-link
-        run:  cargo test -p windows-link --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-link --target ${{ matrix.target }}
       - name: Test windows-numerics
-        run:  cargo test -p windows-numerics --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-numerics --target ${{ matrix.target }}
       - name: Test windows-registry
-        run:  cargo test -p windows-registry --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-registry --target ${{ matrix.target }}
       - name: Test windows-result
-        run:  cargo test -p windows-result --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-result --target ${{ matrix.target }}
       - name: Test windows-strings
-        run:  cargo test -p windows-strings --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-strings --target ${{ matrix.target }}
       - name: Test windows-sys
-        run:  cargo test -p windows-sys --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-sys --target ${{ matrix.target }}
       - name: Test windows-targets
-        run:  cargo test -p windows-targets --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-targets --target ${{ matrix.target }}
       - name: Test windows-version
-        run:  cargo test -p windows-version --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows-version --target ${{ matrix.target }}
       - name: Test windows_aarch64_gnullvm
-        run:  cargo test -p windows_aarch64_gnullvm --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows_aarch64_gnullvm --target ${{ matrix.target }}
       - name: Test windows_aarch64_msvc
-        run:  cargo test -p windows_aarch64_msvc --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows_aarch64_msvc --target ${{ matrix.target }}
       - name: Test windows_i686_gnu
-        run:  cargo test -p windows_i686_gnu --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows_i686_gnu --target ${{ matrix.target }}
       - name: Test windows_i686_gnullvm
-        run:  cargo test -p windows_i686_gnullvm --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows_i686_gnullvm --target ${{ matrix.target }}
       - name: Test windows_i686_msvc
-        run:  cargo test -p windows_i686_msvc --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows_i686_msvc --target ${{ matrix.target }}
       - name: Test windows_x86_64_gnu
-        run:  cargo test -p windows_x86_64_gnu --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows_x86_64_gnu --target ${{ matrix.target }}
       - name: Test windows_x86_64_gnullvm
-        run:  cargo test -p windows_x86_64_gnullvm --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows_x86_64_gnullvm --target ${{ matrix.target }}
       - name: Test windows_x86_64_msvc
-        run:  cargo test -p windows_x86_64_msvc --target ${{ matrix.target }} ${{ matrix.etc }}
+        run:  cargo test -p windows_x86_64_msvc --target ${{ matrix.target }}
       - name: Check diff
         shell: bash
         run: |
diff --git a/crates/tools/yml/src/test.rs b/crates/tools/yml/src/test.rs
index 67e1d7a707..aa975a3bbf 100644
--- a/crates/tools/yml/src/test.rs
+++ b/crates/tools/yml/src/test.rs
@@ -25,27 +25,22 @@ jobs:
             host: x86_64-pc-windows-msvc
             target: x86_64-pc-windows-msvc
             runner: windows-2022
-            etc:
           - version: nightly
             host: x86_64-pc-windows-msvc
             target: i686-pc-windows-msvc
             runner: windows-2022
-            etc:
           - version: nightly
             host: x86_64-pc-windows-gnu
             target: x86_64-pc-windows-gnu
             runner: windows-2022
-            etc:
           - version: stable
             host: x86_64-pc-windows-gnu
             target: i686-pc-windows-gnu
             runner: windows-2022
-            etc:
           - version: stable
             host: aarch64-pc-windows-msvc
             target: aarch64-pc-windows-msvc
             runner: windows-11-arm
-            etc:
 
     runs-on: ${{ matrix.runner }}
 
@@ -89,7 +84,7 @@ jobs:
             &mut yml,
             r"
       - name: Test {name}
-        run:  cargo test -p {name} --target ${{{{ matrix.target }}}} ${{{{ matrix.etc }}}}"
+        run:  cargo test -p {name} --target ${{{{ matrix.target }}}}"
         )
         .unwrap();
     }