Merge remote-tracking branch 'upstream/main'

thebrowsercompany · Aug 16, 2024 · 9acea4e · 9acea4e
2 parents 534b972 + a75c14e
commit 9acea4e
Show file tree

Hide file tree

Showing 6 changed files with 1,348 additions and 803 deletions.
diff --git a/.github/workflows/build-toolchain.yml b/.github/workflows/build-toolchain.yml
diff --git a/.github/workflows/pull-request-swift-toolchain-cirun.yml b/.github/workflows/pull-request-swift-toolchain-cirun.yml
@@ -14,11 +14,11 @@ jobs:
   call_development_snapshot:
     if: vars.USE_CIRUN == 'true'
     name: Development Snapshot
-    uses: ./.github/workflows/swift-toolchain.yml
+    uses: ./.github/workflows/build-toolchain.yml
     with:
       create_release: false
-      default_runner: "cirun-win11-23h2-pro-x64-16-2024-05-17--${{ github.run_id }}"
-      compilers_runner: "cirun-win11-23h2-pro-x64-64-2024-05-17--${{ github.run_id }}"
+      windows_default_runner: "cirun-win11-23h2-pro-x64-16-2024-05-17--${{ github.run_id }}"
+      windows_compilers_runner: "cirun-win11-23h2-pro-x64-64-2024-05-17--${{ github.run_id }}"
       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
@@ -13,11 +13,11 @@ on:
 jobs:
   call_development_snapshot:
     name: Development Snapshot
-    uses: ./.github/workflows/swift-toolchain.yml
+    uses: ./.github/workflows/build-toolchain.yml
     with:
       create_release: false
-      default_runner: "swift-build-windows-latest-8-cores"
-      compilers_runner: "swift-build-windows-latest-64-cores"
+      windows_default_runner: "swift-build-windows-latest-8-cores"
+      windows_compilers_runner: "swift-build-windows-latest-64-cores"
       android_api_level: 28
     secrets: inherit
     permissions:

diff --git a/.github/workflows/schedule-swift-toolchain.yml b/.github/workflows/schedule-swift-toolchain.yml
@@ -11,11 +11,11 @@ on:
 jobs:
   call_development_snapshot:
     name: Development Snapshot
-    uses: ./.github/workflows/swift-toolchain.yml
+    uses: ./.github/workflows/build-toolchain.yml
     with:
       create_release: true
-      default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-05-17--{0}', github.run_id) || 'swift-build-windows-latest-8-cores' }}
-      compilers_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-64-2024-05-17--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
+      windows_default_runner: ${{ vars.USE_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-05-17--{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-05-17--{0}', github.run_id) || 'swift-build-windows-latest-64-cores' }}
       android_api_level: 28
     secrets: inherit
     permissions: