[cirun] Use GHA Windows x64 images

thebrowsercompany · Jan 27, 2025 · 62affaf · 62affaf
1 parent f4c45ca
commit 62affaf
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/.cirun.yml b/.cirun.yml
@@ -37,19 +37,19 @@ runners:
   - name: win11-23h2-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-23h2-pro-x64/versions/2024.12.19"
+    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI-GHA/providers/Microsoft.Compute/images/gha-win-2025-202525211925"
     labels:
-      - cirun-win11-23h2-pro-x64-16-2024-12-19
+      - cirun-win11-23h2-pro-x64-16-2025-01-27
     extra_config:
       runner_path: "D:\\r"
       runner_user: runner
       run_as: interactive
   - name: win11-23h2-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-23h2-pro-x64/versions/2024.12.19"
+    machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI-GHA/providers/Microsoft.Compute/images/gha-win-2025-202525211925"
     labels:
-      - cirun-win11-23h2-pro-x64-64-2024-12-19
+      - cirun-win11-23h2-pro-x64-64-2025-01-27
     extra_config:
       runner_path: "D:\\r"
       runner_user: runner

diff --git a/.github/workflows/pull-request-swift-toolchain-cirun.yml b/.github/workflows/pull-request-swift-toolchain-cirun.yml
@@ -17,8 +17,8 @@ jobs:
     uses: ./.github/workflows/build-toolchain.yml
     with:
       create_release: false
-      windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-12-19--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
-      windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-12-19--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
+      windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2025-01-27--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
+      windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2025-01-27--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
       windows_arm64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-16-2024-12-19--{0}', github.run_id) || 'swift-build-windows-arm64-latest-8-cores' }}
       windows_arm64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-64-2024-12-19--{0}', github.run_id) || 'swift-build-windows-arm64-latest-32-cores' }}
       android_api_level: 28

diff --git a/.github/workflows/release-6-0-swift-toolchain-schedule.yml b/.github/workflows/release-6-0-swift-toolchain-schedule.yml
@@ -14,8 +14,8 @@ jobs:
     uses: thebrowsercompany/swift-build/.github/workflows/build-toolchain.yml@release/6.0
     with:
       create_release: true
-      windows_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-12-19--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
-      windows_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-12-19--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
+      windows_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2025-01-27--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
+      windows_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2025-01-27--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
       android_api_level: 28
     secrets:
       SYMBOL_SERVER_PAT: ${{ secrets.SYMBOL_SERVER_PAT }}

diff --git a/.github/workflows/schedule-swift-toolchain-windows-arm64.yml b/.github/workflows/schedule-swift-toolchain-windows-arm64.yml
@@ -16,8 +16,8 @@ jobs:
       create_release: false
       create_snapshot: false
       windows_build_arch: arm64
-      windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-12-19--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
-      windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-12-19--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
+      windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2025-01-27--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
+      windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2025-01-27--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
       windows_arm64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-16-2024-12-19--{0}', github.run_id) || 'swift-build-windows-arm64-latest-8-cores' }}
       windows_arm64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-64-2024-12-19--{0}', github.run_id) || 'swift-build-windows-arm64-latest-32-cores' }}
       android_api_level: 28

diff --git a/.github/workflows/schedule-swift-toolchain.yml b/.github/workflows/schedule-swift-toolchain.yml
@@ -14,8 +14,8 @@ jobs:
     uses: ./.github/workflows/build-toolchain.yml
     with:
       windows_build_arch: amd64
-      windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-12-19--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
-      windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-12-19--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
+      windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2025-01-27--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
+      windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2025-01-27--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
       windows_arm64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-16-2024-12-19--{0}', github.run_id) || 'swift-build-windows-arm64-latest-8-cores' }}
       windows_arm64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-64-2024-12-19--{0}', github.run_id) || 'swift-build-windows-arm64-latest-32-cores' }}
       android_api_level: 28

diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml
@@ -3495,18 +3495,21 @@ jobs:
           path: |
             ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/bld.msi
             ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/bld.cab
+
       - uses: actions/upload-artifact@v4
         with:
           name: cli-${{ matrix.arch }}-msi
           path: |
             ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/cli.msi
             ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/cli.cab
+
       - uses: actions/upload-artifact@v4
         with:
           name: dbg-${{ matrix.arch }}-msi
           path: |
             ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/dbg.msi
             ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}/dbg.cab
+
       - uses: actions/upload-artifact@v4
         with:
           name: ide-${{ matrix.arch }}-msi
@@ -3746,6 +3749,7 @@ jobs:
         with:
           name: ide-${{ matrix.arch }}-msi
           path: ${{ github.workspace }}/BinaryCache/installer/Release/${{ matrix.arch }}
+
       - uses: actions/download-artifact@v4
         with:
           name: rtl-windows-${{ matrix.arch }}-msi
@@ -3762,6 +3766,7 @@ jobs:
         with:
           name: rtl-windows-arm64-msm
           path: ${{ github.workspace }}/BinaryCache/installer/Release/arm64
+
       - uses: actions/download-artifact@v4
         with:
           name: sdk-windows-amd64-msi
@@ -3816,11 +3821,6 @@ jobs:
           Echo CERTIFICATE=$PFXPath | Out-File -FilePath ${env:GITHUB_ENV} -Encoding utf8 -Append
         if: ${{ inputs.signed }}
 
-      # TODO(issues/154): Preload WixToolset.Sdk on Azure images so we can remove this step.
-      - name: Install WixToolset.Sdk
-        run: |
-          Install-Package -Name WixToolset.Sdk -RequiredVersion 4.0.1 -Force
-
       # The installer bundle needs the shared project for localization strings,
       # but it won't build the dependency on its own due to -p:BuildProjectReferences=false.
       - name: Build shared project