Test 2026.03.07 Win11 25H2 VM image update

.cirun.yml

@@ -19,7 +19,7 @@ runners:
   - name: win11-pro-arm64-16
     cloud: azure
     instance_type: Standard_D16plds_v5
-    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-24h2-pro-arm64/versions/2025.10.15"
+    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-25h2-pro-arm64/versions/2026.03.11"
     labels:
       - cirun-win11-pro-arm64-16
     extra_config:
@@ -30,7 +30,7 @@ runners:
   - name: win11-pro-arm64-64
     cloud: azure
     instance_type: Standard_D64plds_v5
-    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-24h2-pro-arm64/versions/2025.10.15"
+    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-25h2-pro-arm64/versions/2026.03.11"
     labels:
       - cirun-win11-pro-arm64-64
     extra_config:
@@ -41,7 +41,7 @@ runners:
   - name: win11-pro-x64-16
     cloud: azure
     instance_type: Standard_F16s_v2
-    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-24h2-pro-x64/versions/2025.10.15"
+    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-25h2-pro-x64/versions/2026.03.11"
     labels:
       - cirun-win11-pro-x64-16
     extra_config:
@@ -52,7 +52,7 @@ runners:
   - name: win11-pro-x64-64
     cloud: azure
     instance_type: Standard_D64ads_v5
-    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-24h2-pro-x64/versions/2025.10.15"
+    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-25h2-pro-x64/versions/2026.03.11"
     labels:
       - cirun-win11-pro-x64-64
     extra_config:

.github/actions/setup-build/action.yml

@@ -352,6 +352,7 @@ runs:
         swift-version: ${{ steps.sanitize-input.outputs.swift-branch }}
         swift-build: ${{ steps.sanitize-input.outputs.swift-tag }}
         build_arch: ${{ steps.sanitize-input.outputs.build-arch }}
+        installer-args: /log ${{ runner.temp }}\install.log
 
     - name: Setup Swift toolchain (Custom)
       if: inputs.swift-version != '' && inputs.swift-repo != ''
@@ -364,13 +365,66 @@ runs:
         release-asset-name: ${{ steps.sanitize-input.outputs.swift-release-asset }}
         release-tag-name: ${{ steps.sanitize-input.outputs.swift-release-tag }}
 
-    - name: Upload Swift installer log
+    - name: Verify Swift on PATH
+      if: failure() && steps.sanitize-input.outputs.build-os == 'windows' && inputs.swift-version != ''
+      shell: powershell
+      run: |
+        $found = Get-Command swift -ErrorAction SilentlyContinue
+        if ($found) {
+          Write-Host "swift found on PATH: $($found.Source)"
+          exit 0
+        }
+
+        Write-Host "WARNING: swift not found on PATH after installer completed"
+        Write-Host "Current PATH entries:"
+        $env:PATH -split ';' | ForEach-Object { Write-Host "  $_" }
+
+        for ($i = 1; $i -le 3; $i++) {
+          Write-Host ""
+          Write-Host "=== Retry $i/3: checking running processes ==="
+          Get-Process | Where-Object { $_.Path -ne $null } | Select-Object Id, Name, Path | Sort-Object Name | Format-Table -AutoSize
+
+          Write-Host "Waiting 10 seconds..."
+          Start-Sleep -Seconds 10
+
+          # Re-read PATH from registry in case installer updated it
+          $machinePath = [Environment]::GetEnvironmentVariable('PATH', 'Machine')
+          $userPath = [Environment]::GetEnvironmentVariable('PATH', 'User')
+          $env:PATH = "$machinePath;$userPath"
+
+          $found = Get-Command swift -ErrorAction SilentlyContinue
+          if ($found) {
+            Write-Host "swift found on PATH after retry $i : $($found.Source)"
+            Write-Host "Updated PATH entries:"
+            $env:PATH -split ';' | ForEach-Object { Write-Host "  $_" }
+            Write-Host "::error::swift was not on PATH immediately after install, found after ${i}0s delay"
+            exit 1
+          }
+
+          Write-Host "swift still not on PATH after retry $i"
+          Write-Host "Current PATH entries:"
+          $env:PATH -split ';' | ForEach-Object { Write-Host "  $_" }
+        }
+
+        Write-Host "::error::swift not found on PATH after 30s of retries"
+        exit 1
+
+    - name: Print Swift installer log
       if: always() && steps.sanitize-input.outputs.build-os == 'windows' && inputs.swift-version != ''
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ github.job }}-swift-installer-log
-        path: ${{ runner.temp }}/install.log
-        if-no-files-found: ignore
+      shell: powershell
+      run: |
+        $logs = @()
+        $logs += Get-Item "${{ runner.temp }}\install.log" -ErrorAction SilentlyContinue
+        $logs += Get-Item "$env:TEMP\SwiftToolKit_*.log" -ErrorAction SilentlyContinue
+        if ($logs.Count -eq 0) {
+          Write-Host "No installer log files found"
+          exit 0
+        }
+        foreach ($log in $logs) {
+          Write-Host "::group::$($log.Name) ($($log.Length) bytes)"
+          Get-Content $log.FullName
+          Write-Host "::endgroup::"
+        }
 
     - name: Update Swift toolchain module maps
       if: steps.sanitize-input.outputs.build-os == 'windows' && inputs.swift-version != ''
@@ -430,6 +484,7 @@ runs:
         }
 
     - name: Redirect TEMP to workspace drive
+      if: steps.sanitize-input.outputs.build-os == 'windows'
       shell: pwsh
       run: |
         $newTemp = "${{ github.workspace }}\Temp"

.github/workflows/swift-toolchain.yml

@@ -6346,6 +6346,7 @@ jobs:
       - name: Build & Test compnerd/swift-win32
         working-directory: ${{ github.workspace }}/SourceCache/swift-win32
         run: |
+          $ErrorView = 'NormalView'
           swift build
           swift test -Xswiftc -DENABLE_TESTING
 
@@ -6358,6 +6359,7 @@ jobs:
       - name: Build & Test pointfreeco/swift-issue-reporting
         working-directory: ${{ github.workspace }}/SourceCache/swift-issue-reporting
         run: |
+          $ErrorView = 'NormalView'
           swift build -c release
           swift test -c release