I think this is all the windows-2022 updates we need...

microsoft · May 29, 2024 · 6ef5118 · 6ef5118
1 parent 3d5be91
commit 6ef5118
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/.github/actions/fix-environment/action.yml b/.github/actions/fix-environment/action.yml
@@ -7,6 +7,9 @@ runs:
     - name: Configure environment
       shell: pwsh
       run: |
+        $vs_root = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" `
+          -latest -property installationPath -format value
+
         switch -Wildcard ("${{ matrix.target }}")
         {
           "*-pc-windows-gnu"
@@ -15,27 +18,27 @@ runs:
           }
           "i686*"
           {
-            "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x86" >> $env:GITHUB_PATH
-            ((Resolve-Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\*\bin\Hostx86\x86")
+            "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.22000.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*"
           {
-            "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH
-            ((Resolve-Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\*\bin\Hostx64\x64")
+            "${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")
               | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
           }
           "aarch64*"
           {
-            "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64" >> $env:GITHUB_PATH
-            ((Resolve-Path "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\*\bin\Hostx64\x64")
+            "${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")
               | Sort-Object -Descending | Select -First 1).ToString() >> $env:GITHUB_PATH
           }
           "*"
           {
             (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=C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\winrt;C:\Program Files (x86)\Windows Kits\10\include\10.0.22000.0\cppwinrt" `
+            "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" `
               >> $env:GITHUB_ENV
           }
-        }
+        }
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   check:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     strategy:
       matrix:
@@ -37,16 +37,16 @@ jobs:
 
       - name: Fix environment
         uses: ./.github/actions/fix-environment
-      
+
       - name: Clean
         run:  cargo clean
 
       - name: Run fmt
-        run: cargo fmt --all -- --check 
+        run: cargo fmt --all -- --check
 
       # Test will build the code, then also test it.
       - name: Test
-        run:  cargo test --no-default-features --features ${{matrix.branding}}  --target ${{ matrix.target }} 
+        run:  cargo test --no-default-features --features ${{matrix.branding}}  --target ${{ matrix.target }}
 
       - name: Run clippy
-        run: cargo clippy  --no-default-features --features ${{matrix.branding}} --target ${{matrix.target}} --frozen --release 2>&1
+        run: cargo clippy  --no-default-features --features ${{matrix.branding}} --target ${{matrix.target}} 2>&1