Skip to content

Commit 85f1370

Browse files
Manishearthehuss
Manishearth
authored and
ehuss
committed
Rollup merge of rust-lang#74418 - rye:gha-dedup-shell-setting, r=pietroalbini
ci: Set `shell: bash` as a default, remove duplicates A follow-up to rust-lang#74406, this commit merely removes the `shell: bash` lines where they were added in favor of setting defaults for *all* "run" steps in the jobs that run the tests. The changes in rust-lang#74406 were needed because of an upstream change to the `windows-2019` GitHub Actions image. Previously, the configuration worked fine without specifying `shell: bash`, but for some reason this broke with a new change that was deployed today. The preceding PR was a hotfix to get CI passing, but there was a slightly less duplicative way to specify the default shell for the jobs, which was to set the `defaults.run` option. This change applies to the `pr`, `try`, `auto`, and `auto-fallible` jobs, which are derived from the YAML-anchor `base-ci-job`. I did not apply these changes to the `master`, `try-success`, `try-failure`, `auto-success`, or `auto-failure` jobs because they have only a few steps. cc/r? @Mark-Simulacrum
1 parent 59e3a05 commit 85f1370

File tree

4 files changed

+5
-132
lines changed

4 files changed

+5
-132
lines changed

‎.github/workflows/ci.yml

+1-81
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ name: CI
2626
- "**"
2727
defaults:
2828
run:
29-
shell: "python src/ci/exec-with-shell.py {0}"
29+
shell: bash
3030
jobs:
3131
pr:
3232
name: PR
@@ -54,7 +54,6 @@ jobs:
5454
steps:
5555
- name: disable git crlf conversion
5656
run: git config --global core.autocrlf false
57-
shell: bash
5857
- name: checkout the source code
5958
uses: actions/checkout@v1
6059
with:
@@ -66,85 +65,66 @@ jobs:
6665
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
6766
- name: add extra environment variables
6867
run: src/ci/scripts/setup-environment.sh
69-
shell: bash
7068
env:
7169
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
7270
if: success() && !env.SKIP_JOB
7371
- name: decide whether to skip this job
7472
run: src/ci/scripts/should-skip-this.sh
75-
shell: bash
7673
if: success() && !env.SKIP_JOB
7774
- name: collect CPU statistics
7875
run: src/ci/scripts/collect-cpu-stats.sh
79-
shell: bash
8076
if: success() && !env.SKIP_JOB
8177
- name: show the current environment
8278
run: src/ci/scripts/dump-environment.sh
83-
shell: bash
8479
if: success() && !env.SKIP_JOB
8580
- name: install awscli
8681
run: src/ci/scripts/install-awscli.sh
87-
shell: bash
8882
if: success() && !env.SKIP_JOB
8983
- name: install sccache
9084
run: src/ci/scripts/install-sccache.sh
91-
shell: bash
9285
if: success() && !env.SKIP_JOB
9386
- name: install clang
9487
run: src/ci/scripts/install-clang.sh
95-
shell: bash
9688
if: success() && !env.SKIP_JOB
9789
- name: install WIX
9890
run: src/ci/scripts/install-wix.sh
99-
shell: bash
10091
if: success() && !env.SKIP_JOB
10192
- name: ensure the build happens on a partition with enough space
10293
run: src/ci/scripts/symlink-build-dir.sh
103-
shell: bash
10494
if: success() && !env.SKIP_JOB
10595
- name: disable git crlf conversion
10696
run: src/ci/scripts/disable-git-crlf-conversion.sh
107-
shell: bash
10897
if: success() && !env.SKIP_JOB
10998
- name: install MSYS2
11099
run: src/ci/scripts/install-msys2.sh
111-
shell: bash
112100
if: success() && !env.SKIP_JOB
113101
- name: install MinGW
114102
run: src/ci/scripts/install-mingw.sh
115-
shell: bash
116103
if: success() && !env.SKIP_JOB
117104
- name: install ninja
118105
run: src/ci/scripts/install-ninja.sh
119-
shell: bash
120106
if: success() && !env.SKIP_JOB
121107
- name: enable ipv6 on Docker
122108
run: src/ci/scripts/enable-docker-ipv6.sh
123-
shell: bash
124109
if: success() && !env.SKIP_JOB
125110
- name: disable git crlf conversion
126111
run: src/ci/scripts/disable-git-crlf-conversion.sh
127-
shell: bash
128112
if: success() && !env.SKIP_JOB
129113
- name: checkout submodules
130114
run: src/ci/scripts/checkout-submodules.sh
131-
shell: bash
132115
if: success() && !env.SKIP_JOB
133116
- name: ensure line endings are correct
134117
run: src/ci/scripts/verify-line-endings.sh
135-
shell: bash
136118
if: success() && !env.SKIP_JOB
137119
- name: run the build
138120
run: src/ci/scripts/run-build-from-ci.sh
139-
shell: bash
140121
env:
141122
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
142123
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
143124
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
144125
if: success() && !env.SKIP_JOB
145126
- name: upload artifacts to S3
146127
run: src/ci/scripts/upload-artifacts.sh
147-
shell: bash
148128
env:
149129
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
150130
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -173,7 +153,6 @@ jobs:
173153
steps:
174154
- name: disable git crlf conversion
175155
run: git config --global core.autocrlf false
176-
shell: bash
177156
- name: checkout the source code
178157
uses: actions/checkout@v1
179158
with:
@@ -185,85 +164,66 @@ jobs:
185164
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
186165
- name: add extra environment variables
187166
run: src/ci/scripts/setup-environment.sh
188-
shell: bash
189167
env:
190168
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
191169
if: success() && !env.SKIP_JOB
192170
- name: decide whether to skip this job
193171
run: src/ci/scripts/should-skip-this.sh
194-
shell: bash
195172
if: success() && !env.SKIP_JOB
196173
- name: collect CPU statistics
197174
run: src/ci/scripts/collect-cpu-stats.sh
198-
shell: bash
199175
if: success() && !env.SKIP_JOB
200176
- name: show the current environment
201177
run: src/ci/scripts/dump-environment.sh
202-
shell: bash
203178
if: success() && !env.SKIP_JOB
204179
- name: install awscli
205180
run: src/ci/scripts/install-awscli.sh
206-
shell: bash
207181
if: success() && !env.SKIP_JOB
208182
- name: install sccache
209183
run: src/ci/scripts/install-sccache.sh
210-
shell: bash
211184
if: success() && !env.SKIP_JOB
212185
- name: install clang
213186
run: src/ci/scripts/install-clang.sh
214-
shell: bash
215187
if: success() && !env.SKIP_JOB
216188
- name: install WIX
217189
run: src/ci/scripts/install-wix.sh
218-
shell: bash
219190
if: success() && !env.SKIP_JOB
220191
- name: ensure the build happens on a partition with enough space
221192
run: src/ci/scripts/symlink-build-dir.sh
222-
shell: bash
223193
if: success() && !env.SKIP_JOB
224194
- name: disable git crlf conversion
225195
run: src/ci/scripts/disable-git-crlf-conversion.sh
226-
shell: bash
227196
if: success() && !env.SKIP_JOB
228197
- name: install MSYS2
229198
run: src/ci/scripts/install-msys2.sh
230-
shell: bash
231199
if: success() && !env.SKIP_JOB
232200
- name: install MinGW
233201
run: src/ci/scripts/install-mingw.sh
234-
shell: bash
235202
if: success() && !env.SKIP_JOB
236203
- name: install ninja
237204
run: src/ci/scripts/install-ninja.sh
238-
shell: bash
239205
if: success() && !env.SKIP_JOB
240206
- name: enable ipv6 on Docker
241207
run: src/ci/scripts/enable-docker-ipv6.sh
242-
shell: bash
243208
if: success() && !env.SKIP_JOB
244209
- name: disable git crlf conversion
245210
run: src/ci/scripts/disable-git-crlf-conversion.sh
246-
shell: bash
247211
if: success() && !env.SKIP_JOB
248212
- name: checkout submodules
249213
run: src/ci/scripts/checkout-submodules.sh
250-
shell: bash
251214
if: success() && !env.SKIP_JOB
252215
- name: ensure line endings are correct
253216
run: src/ci/scripts/verify-line-endings.sh
254-
shell: bash
255217
if: success() && !env.SKIP_JOB
256218
- name: run the build
257219
run: src/ci/scripts/run-build-from-ci.sh
258-
shell: bash
259220
env:
260221
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
261222
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
262223
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
263224
if: success() && !env.SKIP_JOB
264225
- name: upload artifacts to S3
265226
run: src/ci/scripts/upload-artifacts.sh
266-
shell: bash
267227
env:
268228
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
269229
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -504,7 +464,6 @@ jobs:
504464
steps:
505465
- name: disable git crlf conversion
506466
run: git config --global core.autocrlf false
507-
shell: bash
508467
- name: checkout the source code
509468
uses: actions/checkout@v1
510469
with:
@@ -516,85 +475,66 @@ jobs:
516475
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
517476
- name: add extra environment variables
518477
run: src/ci/scripts/setup-environment.sh
519-
shell: bash
520478
env:
521479
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
522480
if: success() && !env.SKIP_JOB
523481
- name: decide whether to skip this job
524482
run: src/ci/scripts/should-skip-this.sh
525-
shell: bash
526483
if: success() && !env.SKIP_JOB
527484
- name: collect CPU statistics
528485
run: src/ci/scripts/collect-cpu-stats.sh
529-
shell: bash
530486
if: success() && !env.SKIP_JOB
531487
- name: show the current environment
532488
run: src/ci/scripts/dump-environment.sh
533-
shell: bash
534489
if: success() && !env.SKIP_JOB
535490
- name: install awscli
536491
run: src/ci/scripts/install-awscli.sh
537-
shell: bash
538492
if: success() && !env.SKIP_JOB
539493
- name: install sccache
540494
run: src/ci/scripts/install-sccache.sh
541-
shell: bash
542495
if: success() && !env.SKIP_JOB
543496
- name: install clang
544497
run: src/ci/scripts/install-clang.sh
545-
shell: bash
546498
if: success() && !env.SKIP_JOB
547499
- name: install WIX
548500
run: src/ci/scripts/install-wix.sh
549-
shell: bash
550501
if: success() && !env.SKIP_JOB
551502
- name: ensure the build happens on a partition with enough space
552503
run: src/ci/scripts/symlink-build-dir.sh
553-
shell: bash
554504
if: success() && !env.SKIP_JOB
555505
- name: disable git crlf conversion
556506
run: src/ci/scripts/disable-git-crlf-conversion.sh
557-
shell: bash
558507
if: success() && !env.SKIP_JOB
559508
- name: install MSYS2
560509
run: src/ci/scripts/install-msys2.sh
561-
shell: bash
562510
if: success() && !env.SKIP_JOB
563511
- name: install MinGW
564512
run: src/ci/scripts/install-mingw.sh
565-
shell: bash
566513
if: success() && !env.SKIP_JOB
567514
- name: install ninja
568515
run: src/ci/scripts/install-ninja.sh
569-
shell: bash
570516
if: success() && !env.SKIP_JOB
571517
- name: enable ipv6 on Docker
572518
run: src/ci/scripts/enable-docker-ipv6.sh
573-
shell: bash
574519
if: success() && !env.SKIP_JOB
575520
- name: disable git crlf conversion
576521
run: src/ci/scripts/disable-git-crlf-conversion.sh
577-
shell: bash
578522
if: success() && !env.SKIP_JOB
579523
- name: checkout submodules
580524
run: src/ci/scripts/checkout-submodules.sh
581-
shell: bash
582525
if: success() && !env.SKIP_JOB
583526
- name: ensure line endings are correct
584527
run: src/ci/scripts/verify-line-endings.sh
585-
shell: bash
586528
if: success() && !env.SKIP_JOB
587529
- name: run the build
588530
run: src/ci/scripts/run-build-from-ci.sh
589-
shell: bash
590531
env:
591532
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
592533
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
593534
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
594535
if: success() && !env.SKIP_JOB
595536
- name: upload artifacts to S3
596537
run: src/ci/scripts/upload-artifacts.sh
597-
shell: bash
598538
env:
599539
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
600540
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -649,7 +589,6 @@ jobs:
649589
steps:
650590
- name: disable git crlf conversion
651591
run: git config --global core.autocrlf false
652-
shell: bash
653592
- name: checkout the source code
654593
uses: actions/checkout@v1
655594
with:
@@ -661,85 +600,66 @@ jobs:
661600
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
662601
- name: add extra environment variables
663602
run: src/ci/scripts/setup-environment.sh
664-
shell: bash
665603
env:
666604
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
667605
if: success() && !env.SKIP_JOB
668606
- name: decide whether to skip this job
669607
run: src/ci/scripts/should-skip-this.sh
670-
shell: bash
671608
if: success() && !env.SKIP_JOB
672609
- name: collect CPU statistics
673610
run: src/ci/scripts/collect-cpu-stats.sh
674-
shell: bash
675611
if: success() && !env.SKIP_JOB
676612
- name: show the current environment
677613
run: src/ci/scripts/dump-environment.sh
678-
shell: bash
679614
if: success() && !env.SKIP_JOB
680615
- name: install awscli
681616
run: src/ci/scripts/install-awscli.sh
682-
shell: bash
683617
if: success() && !env.SKIP_JOB
684618
- name: install sccache
685619
run: src/ci/scripts/install-sccache.sh
686-
shell: bash
687620
if: success() && !env.SKIP_JOB
688621
- name: install clang
689622
run: src/ci/scripts/install-clang.sh
690-
shell: bash
691623
if: success() && !env.SKIP_JOB
692624
- name: install WIX
693625
run: src/ci/scripts/install-wix.sh
694-
shell: bash
695626
if: success() && !env.SKIP_JOB
696627
- name: ensure the build happens on a partition with enough space
697628
run: src/ci/scripts/symlink-build-dir.sh
698-
shell: bash
699629
if: success() && !env.SKIP_JOB
700630
- name: disable git crlf conversion
701631
run: src/ci/scripts/disable-git-crlf-conversion.sh
702-
shell: bash
703632
if: success() && !env.SKIP_JOB
704633
- name: install MSYS2
705634
run: src/ci/scripts/install-msys2.sh
706-
shell: bash
707635
if: success() && !env.SKIP_JOB
708636
- name: install MinGW
709637
run: src/ci/scripts/install-mingw.sh
710-
shell: bash
711638
if: success() && !env.SKIP_JOB
712639
- name: install ninja
713640
run: src/ci/scripts/install-ninja.sh
714-
shell: bash
715641
if: success() && !env.SKIP_JOB
716642
- name: enable ipv6 on Docker
717643
run: src/ci/scripts/enable-docker-ipv6.sh
718-
shell: bash
719644
if: success() && !env.SKIP_JOB
720645
- name: disable git crlf conversion
721646
run: src/ci/scripts/disable-git-crlf-conversion.sh
722-
shell: bash
723647
if: success() && !env.SKIP_JOB
724648
- name: checkout submodules
725649
run: src/ci/scripts/checkout-submodules.sh
726-
shell: bash
727650
if: success() && !env.SKIP_JOB
728651
- name: ensure line endings are correct
729652
run: src/ci/scripts/verify-line-endings.sh
730-
shell: bash
731653
if: success() && !env.SKIP_JOB
732654
- name: run the build
733655
run: src/ci/scripts/run-build-from-ci.sh
734-
shell: bash
735656
env:
736657
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
737658
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
738659
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
739660
if: success() && !env.SKIP_JOB
740661
- name: upload artifacts to S3
741662
run: src/ci/scripts/upload-artifacts.sh
742-
shell: bash
743663
env:
744664
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
745665
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"

0 commit comments

Comments
 (0)