Add the native ARM64 toolchain build to the main CI (#216)

compnerd · Dec 11, 2024 · ef5c1e9 · ef5c1e9
1 parent b1b0690
commit ef5c1e9
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 7 deletions.
diff --git a/.github/workflows/pull-request-swift-toolchain-cirun.yml b/.github/workflows/pull-request-swift-toolchain-cirun.yml
@@ -17,8 +17,10 @@ jobs:
     uses: ./.github/workflows/build-toolchain.yml
     with:
       create_release: false
-      windows_default_runner: "cirun-win11-23h2-pro-x64-16-2024-10-10--${{ github.run_id }}"
-      windows_compilers_runner: "cirun-win11-23h2-pro-x64-64-2024-10-10--${{ github.run_id }}"
+      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' }}
+      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' }}
+      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' }}
+      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' }}
       android_api_level: 28
     secrets: inherit
     permissions:

diff --git a/.github/workflows/pull-request-swift-toolchain-github.yml b/.github/workflows/pull-request-swift-toolchain-github.yml
@@ -16,8 +16,10 @@ jobs:
     uses: ./.github/workflows/build-toolchain.yml
     with:
       create_release: false
-      windows_default_runner: "swift-build-windows-latest-8-cores"
-      windows_compilers_runner: "swift-build-windows-latest-64-cores"
+      windows_x64_default_runner: "swift-build-windows-latest-8-cores"
+      windows_x64_compilers_runner: "swift-build-windows-latest-64-cores"
+      windows_arm64_default_runner: "swift-build-windows-arm64-latest-8-cores"
+      windows_arm64_compilers_runner: "swift-build-windows-arm64-latest-32-cores"
       android_api_level: 28
     secrets: inherit
     permissions:

diff --git a/.github/workflows/schedule-swift-toolchain-windows-arm64.yml b/.github/workflows/schedule-swift-toolchain-windows-arm64.yml
@@ -0,0 +1,29 @@
+name: Schedule - Development Snapshot Windows/ARM64
+
+on:
+  schedule:
+    - cron: "0 */6 * * *"
+
+  # Allows us to trigger toolchain builds on-demand using the same inputs as scheduled builds.
+  # For more control over the swift-toolchain.yml's inputs, trigger that workflow directly.
+  workflow_dispatch:
+
+jobs:
+  call_development_snapshot:
+    name: Development Snapshot
+    uses: ./.github/workflows/build-toolchain.yml
+    with:
+      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-10-10--{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-10-10--{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-10-10--{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-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-32-cores' }}
+      android_api_level: 28
+      build_android: false
+    secrets: inherit
+    permissions:
+      contents: write
+      packages: write
+      id-token: write
diff --git a/.github/workflows/schedule-swift-toolchain.yml b/.github/workflows/schedule-swift-toolchain.yml
@@ -13,10 +13,33 @@ jobs:
     name: Development Snapshot
     uses: ./.github/workflows/build-toolchain.yml
     with:
-      create_release: true
-      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' }}
-      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' }}
+      windows_build_arch: amd64
+      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' }}
+      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' }}
+      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' }}
+      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' }}
       android_api_level: 28
+      build_android: true
+    secrets: inherit
+    permissions:
+      contents: write
+      packages: write
+      id-token: write
+
+  call_development_snapshot_win_arm64:
+    if: false
+    name: Development Snapshot on Windows/ARM64
+    uses: ./.github/workflows/build-toolchain.yml
+    with:
+      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-10-10--{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-10-10--{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-10-10--{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-10-10--{0}', github.run_id) || 'swift-build-windows-arm64-latest-32-cores' }}
+      android_api_level: 28
+      build_android: false
     secrets: inherit
     permissions:
       contents: write