Skip to content

Commit 7dc6f58

Browse files
ManishearthManishearth
authored
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
2 parents 89fdf3b + 586629c commit 7dc6f58

File tree

4 files changed

+5
-132
lines changed

4 files changed

+5
-132
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 81 deletions
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)] }}"
@@ -510,7 +470,6 @@ jobs:
510470
steps:
511471
- name: disable git crlf conversion
512472
run: git config --global core.autocrlf false
513-
shell: bash
514473
- name: checkout the source code
515474
uses: actions/checkout@v1
516475
with:
@@ -522,85 +481,66 @@ jobs:
522481
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
523482
- name: add extra environment variables
524483
run: src/ci/scripts/setup-environment.sh
525-
shell: bash
526484
env:
527485
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
528486
if: success() && !env.SKIP_JOB
529487
- name: decide whether to skip this job
530488
run: src/ci/scripts/should-skip-this.sh
531-
shell: bash
532489
if: success() && !env.SKIP_JOB
533490
- name: collect CPU statistics
534491
run: src/ci/scripts/collect-cpu-stats.sh
535-
shell: bash
536492
if: success() && !env.SKIP_JOB
537493
- name: show the current environment
538494
run: src/ci/scripts/dump-environment.sh
539-
shell: bash
540495
if: success() && !env.SKIP_JOB
541496
- name: install awscli
542497
run: src/ci/scripts/install-awscli.sh
543-
shell: bash
544498
if: success() && !env.SKIP_JOB
545499
- name: install sccache
546500
run: src/ci/scripts/install-sccache.sh
547-
shell: bash
548501
if: success() && !env.SKIP_JOB
549502
- name: install clang
550503
run: src/ci/scripts/install-clang.sh
551-
shell: bash
552504
if: success() && !env.SKIP_JOB
553505
- name: install WIX
554506
run: src/ci/scripts/install-wix.sh
555-
shell: bash
556507
if: success() && !env.SKIP_JOB
557508
- name: ensure the build happens on a partition with enough space
558509
run: src/ci/scripts/symlink-build-dir.sh
559-
shell: bash
560510
if: success() && !env.SKIP_JOB
561511
- name: disable git crlf conversion
562512
run: src/ci/scripts/disable-git-crlf-conversion.sh
563-
shell: bash
564513
if: success() && !env.SKIP_JOB
565514
- name: install MSYS2
566515
run: src/ci/scripts/install-msys2.sh
567-
shell: bash
568516
if: success() && !env.SKIP_JOB
569517
- name: install MinGW
570518
run: src/ci/scripts/install-mingw.sh
571-
shell: bash
572519
if: success() && !env.SKIP_JOB
573520
- name: install ninja
574521
run: src/ci/scripts/install-ninja.sh
575-
shell: bash
576522
if: success() && !env.SKIP_JOB
577523
- name: enable ipv6 on Docker
578524
run: src/ci/scripts/enable-docker-ipv6.sh
579-
shell: bash
580525
if: success() && !env.SKIP_JOB
581526
- name: disable git crlf conversion
582527
run: src/ci/scripts/disable-git-crlf-conversion.sh
583-
shell: bash
584528
if: success() && !env.SKIP_JOB
585529
- name: checkout submodules
586530
run: src/ci/scripts/checkout-submodules.sh
587-
shell: bash
588531
if: success() && !env.SKIP_JOB
589532
- name: ensure line endings are correct
590533
run: src/ci/scripts/verify-line-endings.sh
591-
shell: bash
592534
if: success() && !env.SKIP_JOB
593535
- name: run the build
594536
run: src/ci/scripts/run-build-from-ci.sh
595-
shell: bash
596537
env:
597538
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
598539
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
599540
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
600541
if: success() && !env.SKIP_JOB
601542
- name: upload artifacts to S3
602543
run: src/ci/scripts/upload-artifacts.sh
603-
shell: bash
604544
env:
605545
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
606546
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -655,7 +595,6 @@ jobs:
655595
steps:
656596
- name: disable git crlf conversion
657597
run: git config --global core.autocrlf false
658-
shell: bash
659598
- name: checkout the source code
660599
uses: actions/checkout@v1
661600
with:
@@ -667,85 +606,66 @@ jobs:
667606
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
668607
- name: add extra environment variables
669608
run: src/ci/scripts/setup-environment.sh
670-
shell: bash
671609
env:
672610
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
673611
if: success() && !env.SKIP_JOB
674612
- name: decide whether to skip this job
675613
run: src/ci/scripts/should-skip-this.sh
676-
shell: bash
677614
if: success() && !env.SKIP_JOB
678615
- name: collect CPU statistics
679616
run: src/ci/scripts/collect-cpu-stats.sh
680-
shell: bash
681617
if: success() && !env.SKIP_JOB
682618
- name: show the current environment
683619
run: src/ci/scripts/dump-environment.sh
684-
shell: bash
685620
if: success() && !env.SKIP_JOB
686621
- name: install awscli
687622
run: src/ci/scripts/install-awscli.sh
688-
shell: bash
689623
if: success() && !env.SKIP_JOB
690624
- name: install sccache
691625
run: src/ci/scripts/install-sccache.sh
692-
shell: bash
693626
if: success() && !env.SKIP_JOB
694627
- name: install clang
695628
run: src/ci/scripts/install-clang.sh
696-
shell: bash
697629
if: success() && !env.SKIP_JOB
698630
- name: install WIX
699631
run: src/ci/scripts/install-wix.sh
700-
shell: bash
701632
if: success() && !env.SKIP_JOB
702633
- name: ensure the build happens on a partition with enough space
703634
run: src/ci/scripts/symlink-build-dir.sh
704-
shell: bash
705635
if: success() && !env.SKIP_JOB
706636
- name: disable git crlf conversion
707637
run: src/ci/scripts/disable-git-crlf-conversion.sh
708-
shell: bash
709638
if: success() && !env.SKIP_JOB
710639
- name: install MSYS2
711640
run: src/ci/scripts/install-msys2.sh
712-
shell: bash
713641
if: success() && !env.SKIP_JOB
714642
- name: install MinGW
715643
run: src/ci/scripts/install-mingw.sh
716-
shell: bash
717644
if: success() && !env.SKIP_JOB
718645
- name: install ninja
719646
run: src/ci/scripts/install-ninja.sh
720-
shell: bash
721647
if: success() && !env.SKIP_JOB
722648
- name: enable ipv6 on Docker
723649
run: src/ci/scripts/enable-docker-ipv6.sh
724-
shell: bash
725650
if: success() && !env.SKIP_JOB
726651
- name: disable git crlf conversion
727652
run: src/ci/scripts/disable-git-crlf-conversion.sh
728-
shell: bash
729653
if: success() && !env.SKIP_JOB
730654
- name: checkout submodules
731655
run: src/ci/scripts/checkout-submodules.sh
732-
shell: bash
733656
if: success() && !env.SKIP_JOB
734657
- name: ensure line endings are correct
735658
run: src/ci/scripts/verify-line-endings.sh
736-
shell: bash
737659
if: success() && !env.SKIP_JOB
738660
- name: run the build
739661
run: src/ci/scripts/run-build-from-ci.sh
740-
shell: bash
741662
env:
742663
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
743664
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
744665
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
745666
if: success() && !env.SKIP_JOB
746667
- name: upload artifacts to S3
747668
run: src/ci/scripts/upload-artifacts.sh
748-
shell: bash
749669
env:
750670
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
751671
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"

0 commit comments

Comments
 (0)