Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to USE_CIRUN variable #127

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/SwiftGen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/SwiftLint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/swift-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ on:
required: true
PASSPHRASE:
required: true
pull_request:

env:
SCCACHE_DIRECT: yes
Expand Down Expand Up @@ -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:
Expand Down
Loading