Skip to content

Commit e0239e1

Browse files
authored
[Mac build] Rename builder to a generic name (#797)
`windows_build_runner` is too Windows-specific. This renames the variable to `default_build_runner`, to make space for future Darwin builds. The variable is kept to its original name in the `context` step, since this step will eventually also output Darwin variables.
1 parent 400fce1 commit e0239e1

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
signed: ${{ steps.context.outputs.signed }}
133133
swift_version: ${{ steps.context.outputs.swift_version }}
134134
swift_tag: ${{ steps.context.outputs.swift_tag }}
135-
windows_build_runner: ${{ steps.context.outputs.windows_build_runner }}
135+
default_build_runner: ${{ steps.context.outputs.windows_build_runner }}
136136
compilers_build_runner: ${{ steps.context.outputs.compilers_build_runner }}
137137
steps:
138138
- id: context
@@ -255,7 +255,7 @@ jobs:
255255

256256
sqlite:
257257
needs: [context]
258-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
258+
runs-on: ${{ needs.context.outputs.default_build_runner }}
259259

260260
strategy:
261261
fail-fast: false
@@ -331,7 +331,7 @@ jobs:
331331

332332
cmark_gfm:
333333
needs: [context]
334-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
334+
runs-on: ${{ needs.context.outputs.default_build_runner }}
335335

336336
strategy:
337337
fail-fast: false
@@ -387,7 +387,7 @@ jobs:
387387

388388
build_tools:
389389
needs: [context, cmark_gfm]
390-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
390+
runs-on: ${{ needs.context.outputs.default_build_runner }}
391391

392392
steps:
393393
- uses: actions/download-artifact@v4
@@ -746,7 +746,7 @@ jobs:
746746

747747
zlib:
748748
needs: [context]
749-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
749+
runs-on: ${{ needs.context.outputs.default_build_runner }}
750750

751751
strategy:
752752
fail-fast: false
@@ -869,7 +869,7 @@ jobs:
869869

870870
curl:
871871
needs: [context, zlib]
872-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
872+
runs-on: ${{ needs.context.outputs.default_build_runner }}
873873

874874
strategy:
875875
fail-fast: false
@@ -1074,7 +1074,7 @@ jobs:
10741074

10751075
libxml2:
10761076
needs: [context]
1077-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
1077+
runs-on: ${{ needs.context.outputs.default_build_runner }}
10781078

10791079
strategy:
10801080
fail-fast: false
@@ -1203,7 +1203,7 @@ jobs:
12031203

12041204
stdlib:
12051205
needs: [context, compilers, cmark_gfm]
1206-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
1206+
runs-on: ${{ needs.context.outputs.default_build_runner }}
12071207

12081208
strategy:
12091209
fail-fast: false
@@ -1489,7 +1489,7 @@ jobs:
14891489

14901490
macros:
14911491
needs: [context, compilers, cmark_gfm, stdlib]
1492-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
1492+
runs-on: ${{ needs.context.outputs.default_build_runner }}
14931493

14941494
strategy:
14951495
fail-fast: false
@@ -1626,7 +1626,7 @@ jobs:
16261626
sdk:
16271627
continue-on-error: ${{ matrix.arch != 'amd64' }}
16281628
needs: [context, libxml2, curl, zlib, compilers, cmark_gfm, stdlib, macros]
1629-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
1629+
runs-on: ${{ needs.context.outputs.default_build_runner }}
16301630

16311631
strategy:
16321632
fail-fast: false
@@ -2045,7 +2045,7 @@ jobs:
20452045

20462046
devtools:
20472047
needs: [context, sqlite, compilers, stdlib, sdk]
2048-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
2048+
runs-on: ${{ needs.context.outputs.default_build_runner }}
20492049

20502050
strategy:
20512051
fail-fast: false
@@ -2746,7 +2746,7 @@ jobs:
27462746
debugging_tools:
27472747
name: Debugging Tools
27482748
needs: [context, compilers, devtools, stdlib, sdk]
2749-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
2749+
runs-on: ${{ needs.context.outputs.default_build_runner }}
27502750

27512751
strategy:
27522752
fail-fast: false
@@ -2888,7 +2888,7 @@ jobs:
28882888
package_tools:
28892889
name: Package Tools
28902890
needs: [context, compilers, macros, debugging_tools, devtools]
2891-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
2891+
runs-on: ${{ needs.context.outputs.main_build_runner }}
28922892

28932893
strategy:
28942894
fail-fast: false
@@ -3048,7 +3048,7 @@ jobs:
30483048
package_sdk_runtime:
30493049
name: Package Windows SDK & Runtime
30503050
needs: [context, stdlib, sdk]
3051-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
3051+
runs-on: ${{ needs.context.outputs.default_build_runner }}
30523052

30533053
strategy:
30543054
fail-fast: false
@@ -3148,7 +3148,7 @@ jobs:
31483148
package_android_sdk:
31493149
name: Package Android SDK & Runtime
31503150
needs: [context, stdlib, sdk]
3151-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
3151+
runs-on: ${{ needs.context.outputs.default_build_runner }}
31523152

31533153
strategy:
31543154
fail-fast: false
@@ -3222,7 +3222,7 @@ jobs:
32223222
32233223
installer:
32243224
needs: [context, package_tools, package_sdk_runtime, package_android_sdk]
3225-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
3225+
runs-on: ${{ needs.context.outputs.default_build_runner }}
32263226

32273227
strategy:
32283228
fail-fast: false
@@ -3356,7 +3356,7 @@ jobs:
33563356

33573357
smoke_test:
33583358
needs: [context, installer]
3359-
runs-on: ${{ needs.context.outputs.windows_build_runner }}
3359+
runs-on: ${{ needs.context.outputs.default_build_runner }}
33603360

33613361
steps:
33623362
- uses: actions/download-artifact@v4

0 commit comments

Comments
 (0)