Skip to content

Use runners from vars if available #812

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Use runners from vars if available #812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 2 additions & 14 deletions .github/workflows/build-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,6 @@ on:
default: true
required: false

windows_default_runner:
description: 'Build runner'
default: 'windows-latest'
required: false
type: string

windows_compilers_runner:
description: 'Build runner for `compilers` job'
type: string
required: false

workflow_call:
inputs:
swift_version:
Expand Down Expand Up @@ -84,7 +73,6 @@ on:

windows_default_runner:
description: 'Build runner'
default: 'windows-latest'
required: false
type: string

Expand Down Expand Up @@ -267,8 +255,8 @@ jobs:
fi
fi

echo windows_build_runner=${{ inputs.windows_default_runner }} >> ${GITHUB_OUTPUT}
echo compilers_build_runner=${{ inputs.windows_compilers_runner || inputs.windows_default_runner }} >> ${GITHUB_OUTPUT}
echo windows_build_runner=${{ inputs.windows_default_runner || vars.WINDOWS_BUILD_RUNNER || 'windows-latest' }} >> ${GITHUB_OUTPUT}
echo compilers_build_runner=${{ inputs.windows_compilers_runner || inputs.windows_default_runner || vars.COMPILERS_BUILD_RUNNER || vars.WINDOWS_BUILD_RUNNER || 'windows-latest' }} >> ${GITHUB_OUTPUT}

echo ANDROID_API_LEVEL=${{ inputs.android_api_level }} >> ${GITHUB_OUTPUT}

Expand Down