Skip to content

Commit 67bb06c

Browse files
authored
Use runners from vars if available (#812)
This was removed in #801 to bring the file in line with downstream. However, it is better to rely on the vars environment when invoking the main workflow from dispatch, while offering an override when invoking the workflow as a sub-workflow.
1 parent 0579aa8 commit 67bb06c

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,6 @@ on:
3636
default: true
3737
required: false
3838

39-
windows_default_runner:
40-
description: 'Build runner'
41-
default: 'windows-latest'
42-
required: false
43-
type: string
44-
45-
windows_compilers_runner:
46-
description: 'Build runner for `compilers` job'
47-
type: string
48-
required: false
49-
5039
workflow_call:
5140
inputs:
5241
swift_version:
@@ -84,7 +73,6 @@ on:
8473

8574
windows_default_runner:
8675
description: 'Build runner'
87-
default: 'windows-latest'
8876
required: false
8977
type: string
9078

@@ -267,8 +255,8 @@ jobs:
267255
fi
268256
fi
269257
270-
echo windows_build_runner=${{ inputs.windows_default_runner }} >> ${GITHUB_OUTPUT}
271-
echo compilers_build_runner=${{ inputs.windows_compilers_runner || inputs.windows_default_runner }} >> ${GITHUB_OUTPUT}
258+
echo windows_build_runner=${{ inputs.windows_default_runner || vars.WINDOWS_BUILD_RUNNER || 'windows-latest' }} >> ${GITHUB_OUTPUT}
259+
echo compilers_build_runner=${{ inputs.windows_compilers_runner || inputs.windows_default_runner || vars.COMPILERS_BUILD_RUNNER || vars.WINDOWS_BUILD_RUNNER || 'windows-latest' }} >> ${GITHUB_OUTPUT}
272260
273261
echo ANDROID_API_LEVEL=${{ inputs.android_api_level }} >> ${GITHUB_OUTPUT}
274262

0 commit comments

Comments
 (0)