From c8d522af6ff94551b8ecc450696d72240a442ad1 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Ruel <marc-antoine@thebrowser.company>
Date: Mon, 26 Feb 2024 10:26:00 -0500
Subject: [PATCH] Add .cirun.yml to declare the OS configurations we want to
 use.

---
 .github/workflows/SwiftGen.yml        |  2 +-
 .github/workflows/SwiftLint.yml       |  2 +-
 .github/workflows/swift-toolchain.yml | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/SwiftGen.yml b/.github/workflows/SwiftGen.yml
index 16b291aaa..5f3f18467 100644
--- 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
index a9ccb9e79..3c9d4db6c 100644
--- 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
index 991b73426..b0a703be2 100644
--- 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: