Add .cirun.yml to declare the OS configurations we want to use.

thebrowsercompany · May 14, 2024 · c8d522a · c8d522a
1 parent 22570fe
commit c8d522a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/SwiftGen.yml b/.github/workflows/SwiftGen.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   windows:
-    runs-on: windows-latest
+    runs-on: "${{ vars.USE_WINDOWS_GHA_RUNNER == 'true' && 'windows-latest' || format('cirun-win11pro-23h2-x64-16-2024-05-13--{0}', github.run_id) }}"
 
     strategy:
       matrix:

diff --git a/.github/workflows/SwiftLint.yml b/.github/workflows/SwiftLint.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   windows:
-    runs-on: windows-latest
+    runs-on: "${{ vars.USE_WINDOWS_GHA_RUNNER == 'true' && 'windows-latest' || format('cirun-win11pro-23h2-x64-16-2024-05-13--{0}', github.run_id) }}"
 
     strategy:
       matrix:

diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml
@@ -54,6 +54,7 @@ on:
         required: true
       PASSPHRASE:
         required: true
+  pull_request:
 
 env:
   SCCACHE_DIRECT: yes
@@ -199,8 +200,13 @@ jobs:
             fi
           fi
 
-          echo windows_build_runner=${{ vars.WINDOWS_BUILD_RUNNER || 'windows-latest' }} >> ${GITHUB_OUTPUT}
-          echo compilers_build_runner=${{ vars.COMPILERS_BUILD_RUNNER || vars.WINDOWS_BUILD_RUNNER || 'windows-latest' }} >> ${GITHUB_OUTPUT}
+          if [[ "${{vars.USE_WINDOWS_GHA_RUNNER}}" == "false" ]]; then
+            echo windows_build_runner=cirun-win11pro-23h2-x64-64-2024-05-13--${{github.run_id}} >> ${GITHUB_OUTPUT}
+            echo compilers_build_runner=cirun-win11pro-23h2-x64-16-2024-05-13--${{github.run_id}} >> ${GITHUB_OUTPUT}
+          else
+            echo windows_build_runner=${{ vars.WINDOWS_BUILD_RUNNER || 'windows-latest' }} >> ${GITHUB_OUTPUT}
+            echo compilers_build_runner=${{ vars.COMPILERS_BUILD_RUNNER || vars.WINDOWS_BUILD_RUNNER || 'windows-latest' }} >> ${GITHUB_OUTPUT}
+          fi
 
       - uses: actions/upload-artifact@v4
         with: