Skip to content

Commit ab23a2a

Browse files
ryerye
committed
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 are explicitly added in favor of setting defaults for *all* "run" steps. Signed-off-by: Kristofer Rye <[email protected]>
1 parent 5c9e5df commit ab23a2a

File tree

2 files changed

+15
-100
lines changed

2 files changed

+15
-100
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,12 @@ jobs:
5151
os: ubuntu-latest-xl
5252
timeout-minutes: 600
5353
runs-on: "${{ matrix.os }}"
54+
defaults:
55+
run:
56+
shell: bash
5457
steps:
5558
- name: disable git crlf conversion
5659
run: git config --global core.autocrlf false
57-
shell: bash
5860
- name: checkout the source code
5961
uses: actions/checkout@v1
6062
with:
@@ -66,85 +68,66 @@ jobs:
6668
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
6769
- name: add extra environment variables
6870
run: src/ci/scripts/setup-environment.sh
69-
shell: bash
7071
env:
7172
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
7273
if: success() && !env.SKIP_JOB
7374
- name: decide whether to skip this job
7475
run: src/ci/scripts/should-skip-this.sh
75-
shell: bash
7676
if: success() && !env.SKIP_JOB
7777
- name: collect CPU statistics
7878
run: src/ci/scripts/collect-cpu-stats.sh
79-
shell: bash
8079
if: success() && !env.SKIP_JOB
8180
- name: show the current environment
8281
run: src/ci/scripts/dump-environment.sh
83-
shell: bash
8482
if: success() && !env.SKIP_JOB
8583
- name: install awscli
8684
run: src/ci/scripts/install-awscli.sh
87-
shell: bash
8885
if: success() && !env.SKIP_JOB
8986
- name: install sccache
9087
run: src/ci/scripts/install-sccache.sh
91-
shell: bash
9288
if: success() && !env.SKIP_JOB
9389
- name: install clang
9490
run: src/ci/scripts/install-clang.sh
95-
shell: bash
9691
if: success() && !env.SKIP_JOB
9792
- name: install WIX
9893
run: src/ci/scripts/install-wix.sh
99-
shell: bash
10094
if: success() && !env.SKIP_JOB
10195
- name: ensure the build happens on a partition with enough space
10296
run: src/ci/scripts/symlink-build-dir.sh
103-
shell: bash
10497
if: success() && !env.SKIP_JOB
10598
- name: disable git crlf conversion
10699
run: src/ci/scripts/disable-git-crlf-conversion.sh
107-
shell: bash
108100
if: success() && !env.SKIP_JOB
109101
- name: install MSYS2
110102
run: src/ci/scripts/install-msys2.sh
111-
shell: bash
112103
if: success() && !env.SKIP_JOB
113104
- name: install MinGW
114105
run: src/ci/scripts/install-mingw.sh
115-
shell: bash
116106
if: success() && !env.SKIP_JOB
117107
- name: install ninja
118108
run: src/ci/scripts/install-ninja.sh
119-
shell: bash
120109
if: success() && !env.SKIP_JOB
121110
- name: enable ipv6 on Docker
122111
run: src/ci/scripts/enable-docker-ipv6.sh
123-
shell: bash
124112
if: success() && !env.SKIP_JOB
125113
- name: disable git crlf conversion
126114
run: src/ci/scripts/disable-git-crlf-conversion.sh
127-
shell: bash
128115
if: success() && !env.SKIP_JOB
129116
- name: checkout submodules
130117
run: src/ci/scripts/checkout-submodules.sh
131-
shell: bash
132118
if: success() && !env.SKIP_JOB
133119
- name: ensure line endings are correct
134120
run: src/ci/scripts/verify-line-endings.sh
135-
shell: bash
136121
if: success() && !env.SKIP_JOB
137122
- name: run the build
138123
run: src/ci/scripts/run-build-from-ci.sh
139-
shell: bash
140124
env:
141125
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
142126
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
143127
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
144128
if: success() && !env.SKIP_JOB
145129
- name: upload artifacts to S3
146130
run: src/ci/scripts/upload-artifacts.sh
147-
shell: bash
148131
env:
149132
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
150133
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -170,10 +153,12 @@ jobs:
170153
env: {}
171154
timeout-minutes: 600
172155
runs-on: "${{ matrix.os }}"
156+
defaults:
157+
run:
158+
shell: bash
173159
steps:
174160
- name: disable git crlf conversion
175161
run: git config --global core.autocrlf false
176-
shell: bash
177162
- name: checkout the source code
178163
uses: actions/checkout@v1
179164
with:
@@ -185,85 +170,66 @@ jobs:
185170
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
186171
- name: add extra environment variables
187172
run: src/ci/scripts/setup-environment.sh
188-
shell: bash
189173
env:
190174
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
191175
if: success() && !env.SKIP_JOB
192176
- name: decide whether to skip this job
193177
run: src/ci/scripts/should-skip-this.sh
194-
shell: bash
195178
if: success() && !env.SKIP_JOB
196179
- name: collect CPU statistics
197180
run: src/ci/scripts/collect-cpu-stats.sh
198-
shell: bash
199181
if: success() && !env.SKIP_JOB
200182
- name: show the current environment
201183
run: src/ci/scripts/dump-environment.sh
202-
shell: bash
203184
if: success() && !env.SKIP_JOB
204185
- name: install awscli
205186
run: src/ci/scripts/install-awscli.sh
206-
shell: bash
207187
if: success() && !env.SKIP_JOB
208188
- name: install sccache
209189
run: src/ci/scripts/install-sccache.sh
210-
shell: bash
211190
if: success() && !env.SKIP_JOB
212191
- name: install clang
213192
run: src/ci/scripts/install-clang.sh
214-
shell: bash
215193
if: success() && !env.SKIP_JOB
216194
- name: install WIX
217195
run: src/ci/scripts/install-wix.sh
218-
shell: bash
219196
if: success() && !env.SKIP_JOB
220197
- name: ensure the build happens on a partition with enough space
221198
run: src/ci/scripts/symlink-build-dir.sh
222-
shell: bash
223199
if: success() && !env.SKIP_JOB
224200
- name: disable git crlf conversion
225201
run: src/ci/scripts/disable-git-crlf-conversion.sh
226-
shell: bash
227202
if: success() && !env.SKIP_JOB
228203
- name: install MSYS2
229204
run: src/ci/scripts/install-msys2.sh
230-
shell: bash
231205
if: success() && !env.SKIP_JOB
232206
- name: install MinGW
233207
run: src/ci/scripts/install-mingw.sh
234-
shell: bash
235208
if: success() && !env.SKIP_JOB
236209
- name: install ninja
237210
run: src/ci/scripts/install-ninja.sh
238-
shell: bash
239211
if: success() && !env.SKIP_JOB
240212
- name: enable ipv6 on Docker
241213
run: src/ci/scripts/enable-docker-ipv6.sh
242-
shell: bash
243214
if: success() && !env.SKIP_JOB
244215
- name: disable git crlf conversion
245216
run: src/ci/scripts/disable-git-crlf-conversion.sh
246-
shell: bash
247217
if: success() && !env.SKIP_JOB
248218
- name: checkout submodules
249219
run: src/ci/scripts/checkout-submodules.sh
250-
shell: bash
251220
if: success() && !env.SKIP_JOB
252221
- name: ensure line endings are correct
253222
run: src/ci/scripts/verify-line-endings.sh
254-
shell: bash
255223
if: success() && !env.SKIP_JOB
256224
- name: run the build
257225
run: src/ci/scripts/run-build-from-ci.sh
258-
shell: bash
259226
env:
260227
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
261228
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
262229
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
263230
if: success() && !env.SKIP_JOB
264231
- name: upload artifacts to S3
265232
run: src/ci/scripts/upload-artifacts.sh
266-
shell: bash
267233
env:
268234
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
269235
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -507,10 +473,12 @@ jobs:
507473
os: windows-latest-xl
508474
timeout-minutes: 600
509475
runs-on: "${{ matrix.os }}"
476+
defaults:
477+
run:
478+
shell: bash
510479
steps:
511480
- name: disable git crlf conversion
512481
run: git config --global core.autocrlf false
513-
shell: bash
514482
- name: checkout the source code
515483
uses: actions/checkout@v1
516484
with:
@@ -522,85 +490,66 @@ jobs:
522490
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
523491
- name: add extra environment variables
524492
run: src/ci/scripts/setup-environment.sh
525-
shell: bash
526493
env:
527494
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
528495
if: success() && !env.SKIP_JOB
529496
- name: decide whether to skip this job
530497
run: src/ci/scripts/should-skip-this.sh
531-
shell: bash
532498
if: success() && !env.SKIP_JOB
533499
- name: collect CPU statistics
534500
run: src/ci/scripts/collect-cpu-stats.sh
535-
shell: bash
536501
if: success() && !env.SKIP_JOB
537502
- name: show the current environment
538503
run: src/ci/scripts/dump-environment.sh
539-
shell: bash
540504
if: success() && !env.SKIP_JOB
541505
- name: install awscli
542506
run: src/ci/scripts/install-awscli.sh
543-
shell: bash
544507
if: success() && !env.SKIP_JOB
545508
- name: install sccache
546509
run: src/ci/scripts/install-sccache.sh
547-
shell: bash
548510
if: success() && !env.SKIP_JOB
549511
- name: install clang
550512
run: src/ci/scripts/install-clang.sh
551-
shell: bash
552513
if: success() && !env.SKIP_JOB
553514
- name: install WIX
554515
run: src/ci/scripts/install-wix.sh
555-
shell: bash
556516
if: success() && !env.SKIP_JOB
557517
- name: ensure the build happens on a partition with enough space
558518
run: src/ci/scripts/symlink-build-dir.sh
559-
shell: bash
560519
if: success() && !env.SKIP_JOB
561520
- name: disable git crlf conversion
562521
run: src/ci/scripts/disable-git-crlf-conversion.sh
563-
shell: bash
564522
if: success() && !env.SKIP_JOB
565523
- name: install MSYS2
566524
run: src/ci/scripts/install-msys2.sh
567-
shell: bash
568525
if: success() && !env.SKIP_JOB
569526
- name: install MinGW
570527
run: src/ci/scripts/install-mingw.sh
571-
shell: bash
572528
if: success() && !env.SKIP_JOB
573529
- name: install ninja
574530
run: src/ci/scripts/install-ninja.sh
575-
shell: bash
576531
if: success() && !env.SKIP_JOB
577532
- name: enable ipv6 on Docker
578533
run: src/ci/scripts/enable-docker-ipv6.sh
579-
shell: bash
580534
if: success() && !env.SKIP_JOB
581535
- name: disable git crlf conversion
582536
run: src/ci/scripts/disable-git-crlf-conversion.sh
583-
shell: bash
584537
if: success() && !env.SKIP_JOB
585538
- name: checkout submodules
586539
run: src/ci/scripts/checkout-submodules.sh
587-
shell: bash
588540
if: success() && !env.SKIP_JOB
589541
- name: ensure line endings are correct
590542
run: src/ci/scripts/verify-line-endings.sh
591-
shell: bash
592543
if: success() && !env.SKIP_JOB
593544
- name: run the build
594545
run: src/ci/scripts/run-build-from-ci.sh
595-
shell: bash
596546
env:
597547
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
598548
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
599549
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
600550
if: success() && !env.SKIP_JOB
601551
- name: upload artifacts to S3
602552
run: src/ci/scripts/upload-artifacts.sh
603-
shell: bash
604553
env:
605554
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
606555
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -652,10 +601,12 @@ jobs:
652601
os: macos-latest
653602
timeout-minutes: 600
654603
runs-on: "${{ matrix.os }}"
604+
defaults:
605+
run:
606+
shell: bash
655607
steps:
656608
- name: disable git crlf conversion
657609
run: git config --global core.autocrlf false
658-
shell: bash
659610
- name: checkout the source code
660611
uses: actions/checkout@v1
661612
with:
@@ -667,85 +618,66 @@ jobs:
667618
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
668619
- name: add extra environment variables
669620
run: src/ci/scripts/setup-environment.sh
670-
shell: bash
671621
env:
672622
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
673623
if: success() && !env.SKIP_JOB
674624
- name: decide whether to skip this job
675625
run: src/ci/scripts/should-skip-this.sh
676-
shell: bash
677626
if: success() && !env.SKIP_JOB
678627
- name: collect CPU statistics
679628
run: src/ci/scripts/collect-cpu-stats.sh
680-
shell: bash
681629
if: success() && !env.SKIP_JOB
682630
- name: show the current environment
683631
run: src/ci/scripts/dump-environment.sh
684-
shell: bash
685632
if: success() && !env.SKIP_JOB
686633
- name: install awscli
687634
run: src/ci/scripts/install-awscli.sh
688-
shell: bash
689635
if: success() && !env.SKIP_JOB
690636
- name: install sccache
691637
run: src/ci/scripts/install-sccache.sh
692-
shell: bash
693638
if: success() && !env.SKIP_JOB
694639
- name: install clang
695640
run: src/ci/scripts/install-clang.sh
696-
shell: bash
697641
if: success() && !env.SKIP_JOB
698642
- name: install WIX
699643
run: src/ci/scripts/install-wix.sh
700-
shell: bash
701644
if: success() && !env.SKIP_JOB
702645
- name: ensure the build happens on a partition with enough space
703646
run: src/ci/scripts/symlink-build-dir.sh
704-
shell: bash
705647
if: success() && !env.SKIP_JOB
706648
- name: disable git crlf conversion
707649
run: src/ci/scripts/disable-git-crlf-conversion.sh
708-
shell: bash
709650
if: success() && !env.SKIP_JOB
710651
- name: install MSYS2
711652
run: src/ci/scripts/install-msys2.sh
712-
shell: bash
713653
if: success() && !env.SKIP_JOB
714654
- name: install MinGW
715655
run: src/ci/scripts/install-mingw.sh
716-
shell: bash
717656
if: success() && !env.SKIP_JOB
718657
- name: install ninja
719658
run: src/ci/scripts/install-ninja.sh
720-
shell: bash
721659
if: success() && !env.SKIP_JOB
722660
- name: enable ipv6 on Docker
723661
run: src/ci/scripts/enable-docker-ipv6.sh
724-
shell: bash
725662
if: success() && !env.SKIP_JOB
726663
- name: disable git crlf conversion
727664
run: src/ci/scripts/disable-git-crlf-conversion.sh
728-
shell: bash
729665
if: success() && !env.SKIP_JOB
730666
- name: checkout submodules
731667
run: src/ci/scripts/checkout-submodules.sh
732-
shell: bash
733668
if: success() && !env.SKIP_JOB
734669
- name: ensure line endings are correct
735670
run: src/ci/scripts/verify-line-endings.sh
736-
shell: bash
737671
if: success() && !env.SKIP_JOB
738672
- name: run the build
739673
run: src/ci/scripts/run-build-from-ci.sh
740-
shell: bash
741674
env:
742675
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
743676
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
744677
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
745678
if: success() && !env.SKIP_JOB
746679
- name: upload artifacts to S3
747680
run: src/ci/scripts/upload-artifacts.sh
748-
shell: bash
749681
env:
750682
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
751683
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"

0 commit comments

Comments
 (0)