Skip to content

Commit 1cc85eb

Browse files
authored
Update the cirun machines to 2024-12-19 (#221)
1 parent b61e430 commit 1cc85eb

6 files changed

+27
-27
lines changed

.cirun.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,39 @@ runners:
1717
- name: win11-23h2-pro-arm64-16
1818
cloud: azure
1919
instance_type: Standard_D16plds_v5
20-
machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-23h2-pro-arm64/versions/2024.10.10"
20+
machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-23h2-pro-arm64/versions/2024.12.19"
2121
labels:
22-
- cirun-win11-23h2-pro-arm64-16-2024-10-10
22+
- cirun-win11-23h2-pro-arm64-16-2024-12-19
2323
extra_config:
2424
runner_path: "D:\\r"
2525
runner_user: runner
2626
run_as: interactive
2727
- name: win11-23h2-pro-arm64-64
2828
cloud: azure
2929
instance_type: Standard_D64plds_v5
30-
machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-23h2-pro-arm64/versions/2024.10.10"
30+
machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-23h2-pro-arm64/versions/2024.12.19"
3131
labels:
32-
- cirun-win11-23h2-pro-arm64-64-2024-10-10
32+
- cirun-win11-23h2-pro-arm64-64-2024-12-19
3333
extra_config:
3434
runner_path: "D:\\r"
3535
runner_user: runner
3636
run_as: interactive
3737
- name: win11-23h2-pro-x64-16
3838
cloud: azure
3939
instance_type: Standard_F16s_v2
40-
machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-23h2-pro-x64/versions/2024.10.10"
40+
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"
4141
labels:
42-
- cirun-win11-23h2-pro-x64-16-2024-10-10
42+
- cirun-win11-23h2-pro-x64-16-2024-12-19
4343
extra_config:
4444
runner_path: "D:\\r"
4545
runner_user: runner
4646
run_as: interactive
4747
- name: win11-23h2-pro-x64-64
4848
cloud: azure
4949
instance_type: Standard_D64ads_v5
50-
machine_image: "/subscriptions/88c2ce23-b441-4d79-8f1c-50d9bc95ed08/resourceGroups/Win-CI/providers/Microsoft.Compute/galleries/base_images/images/win11-23h2-pro-x64/versions/2024.10.10"
50+
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"
5151
labels:
52-
- cirun-win11-23h2-pro-x64-64-2024-10-10
52+
- cirun-win11-23h2-pro-x64-64-2024-12-19
5353
extra_config:
5454
runner_path: "D:\\r"
5555
runner_user: runner

.github/workflows/pull-request-swift-toolchain-cirun.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
uses: ./.github/workflows/build-toolchain.yml
1818
with:
1919
create_release: false
20-
windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
21-
windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
22-
windows_arm64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-16-2024-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-8-cores' }}
23-
windows_arm64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-64-2024-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-32-cores' }}
20+
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' }}
21+
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' }}
22+
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' }}
23+
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' }}
2424
android_api_level: 28
2525
secrets: inherit
2626
permissions:

.github/workflows/release-6-0-swift-toolchain-schedule.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
uses: thebrowsercompany/swift-build/.github/workflows/build-toolchain.yml@release/6.0
1515
with:
1616
create_release: true
17-
windows_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
18-
windows_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
17+
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' }}
18+
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' }}
1919
android_api_level: 28
2020
secrets:
2121
SYMBOL_SERVER_PAT: ${{ secrets.SYMBOL_SERVER_PAT }}

.github/workflows/release-swift-toolchain-binary-sizes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
},
6565
{
6666
"arch": "arm64",
67-
"os": "cirun-win11-23h2-pro-arm64-16-2024-10-10--${{ github.run_id }}",
67+
"os": "cirun-win11-23h2-pro-arm64-16-2024-12-19--${{ github.run_id }}",
6868
"is_cirun": "true"
6969
}
7070
]

.github/workflows/schedule-swift-toolchain-windows-arm64.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
create_release: false
1717
create_snapshot: false
1818
windows_build_arch: arm64
19-
windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
20-
windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
21-
windows_arm64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-16-2024-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-8-cores' }}
22-
windows_arm64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-64-2024-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-32-cores' }}
19+
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' }}
20+
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' }}
21+
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' }}
22+
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' }}
2323
android_api_level: 28
2424
build_android: false
2525
secrets: inherit

.github/workflows/schedule-swift-toolchain.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
uses: ./.github/workflows/build-toolchain.yml
1515
with:
1616
windows_build_arch: amd64
17-
windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
18-
windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
19-
windows_arm64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-16-2024-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-8-cores' }}
20-
windows_arm64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-64-2024-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-32-cores' }}
17+
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' }}
18+
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' }}
19+
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' }}
20+
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' }}
2121
android_api_level: 28
2222
build_android: true
2323
secrets: inherit
@@ -34,10 +34,10 @@ jobs:
3434
create_release: false
3535
create_snapshot: false
3636
windows_build_arch: arm64
37-
windows_x64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
38-
windows_x64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-10-10--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
39-
windows_arm64_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-16-2024-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-8-cores' }}
40-
windows_arm64_compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-arm64-64-2024-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-32-cores' }}
37+
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' }}
38+
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' }}
39+
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' }}
40+
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' }}
4141
android_api_level: 28
4242
build_android: false
4343
secrets: inherit

0 commit comments

Comments
 (0)