From 8ace57dad4eee2645f2ed62c23e0ce89a05145cf Mon Sep 17 00:00:00 2001 From: Marc-Antoine Ruel Date: Mon, 20 May 2024 15:22:20 -0400 Subject: [PATCH] Start using Azure VMs for testing --- .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 16b291aa..a5a67f34 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_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-05-17--{0}', github.run_id) } || 'windows-latest' }}" strategy: matrix: diff --git a/.github/workflows/SwiftLint.yml b/.github/workflows/SwiftLint.yml index a9ccb9e7..e6a865d1 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_CIRUN == 'true' && format('cirun-win11-23h2-pro-x64-16-2024-05-17--{0}', github.run_id) } || 'windows-latest' }}" strategy: matrix: diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index 6812743e..2f640aad 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_CIRUN}}" == "true" ]]; then + echo windows_build_runner=cirun-win11-23h2-pro-x64-16-2024-05-17--${{github.run_id}} >> ${GITHUB_OUTPUT} + echo compilers_build_runner=cirun-win11-23h2-pro-x64-64-2024-05-17--${{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: