Skip to content

Commit 7d0afb1

Browse files
ryeMark-Simulacrum
rye
authored and
Mark-Simulacrum
committed
ci: Set shell: bash as a default, remove duplicates
A follow-up to #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 7747315 commit 7d0afb1

File tree

2 files changed

+12
-80
lines changed

2 files changed

+12
-80
lines changed

‎.github/workflows/ci.yml

Lines changed: 9 additions & 60 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,91 +68,72 @@ 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: install InnoSetup
10296
run: src/ci/scripts/install-innosetup.sh
10397
if: success() && !env.SKIP_JOB
10498
- name: ensure the build happens on a partition with enough space
10599
run: src/ci/scripts/symlink-build-dir.sh
106-
shell: bash
107100
if: success() && !env.SKIP_JOB
108101
- name: disable git crlf conversion
109102
run: src/ci/scripts/disable-git-crlf-conversion.sh
110-
shell: bash
111103
if: success() && !env.SKIP_JOB
112104
- name: install MSYS2
113105
run: src/ci/scripts/install-msys2.sh
114-
shell: bash
115106
if: success() && !env.SKIP_JOB
116107
- name: install MSYS2 packages
117108
run: src/ci/scripts/install-msys2-packages.sh
118109
if: success() && !env.SKIP_JOB
119110
- name: install MinGW
120111
run: src/ci/scripts/install-mingw.sh
121-
shell: bash
122112
if: success() && !env.SKIP_JOB
123113
- name: install ninja
124114
run: src/ci/scripts/install-ninja.sh
125-
shell: bash
126115
if: success() && !env.SKIP_JOB
127116
- name: enable ipv6 on Docker
128117
run: src/ci/scripts/enable-docker-ipv6.sh
129-
shell: bash
130118
if: success() && !env.SKIP_JOB
131119
- name: disable git crlf conversion
132120
run: src/ci/scripts/disable-git-crlf-conversion.sh
133-
shell: bash
134121
if: success() && !env.SKIP_JOB
135122
- name: checkout submodules
136123
run: src/ci/scripts/checkout-submodules.sh
137-
shell: bash
138124
if: success() && !env.SKIP_JOB
139125
- name: ensure line endings are correct
140126
run: src/ci/scripts/verify-line-endings.sh
141-
shell: bash
142127
if: success() && !env.SKIP_JOB
143128
- name: run the build
144129
run: src/ci/scripts/run-build-from-ci.sh
145-
shell: bash
146130
env:
147131
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
148132
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
149133
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
150134
if: success() && !env.SKIP_JOB
151135
- name: upload artifacts to S3
152136
run: src/ci/scripts/upload-artifacts.sh
153-
shell: bash
154137
env:
155138
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
156139
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -180,10 +163,12 @@ jobs:
180163
os: ubuntu-latest-xl
181164
timeout-minutes: 600
182165
runs-on: "${{ matrix.os }}"
166+
defaults:
167+
run:
168+
shell: bash
183169
steps:
184170
- name: disable git crlf conversion
185171
run: git config --global core.autocrlf false
186-
shell: bash
187172
- name: checkout the source code
188173
uses: actions/checkout@v1
189174
with:
@@ -195,91 +180,72 @@ jobs:
195180
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
196181
- name: add extra environment variables
197182
run: src/ci/scripts/setup-environment.sh
198-
shell: bash
199183
env:
200184
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
201185
if: success() && !env.SKIP_JOB
202186
- name: decide whether to skip this job
203187
run: src/ci/scripts/should-skip-this.sh
204-
shell: bash
205188
if: success() && !env.SKIP_JOB
206189
- name: collect CPU statistics
207190
run: src/ci/scripts/collect-cpu-stats.sh
208-
shell: bash
209191
if: success() && !env.SKIP_JOB
210192
- name: show the current environment
211193
run: src/ci/scripts/dump-environment.sh
212-
shell: bash
213194
if: success() && !env.SKIP_JOB
214195
- name: install awscli
215196
run: src/ci/scripts/install-awscli.sh
216-
shell: bash
217197
if: success() && !env.SKIP_JOB
218198
- name: install sccache
219199
run: src/ci/scripts/install-sccache.sh
220-
shell: bash
221200
if: success() && !env.SKIP_JOB
222201
- name: install clang
223202
run: src/ci/scripts/install-clang.sh
224-
shell: bash
225203
if: success() && !env.SKIP_JOB
226204
- name: install WIX
227205
run: src/ci/scripts/install-wix.sh
228-
shell: bash
229206
if: success() && !env.SKIP_JOB
230207
- name: install InnoSetup
231208
run: src/ci/scripts/install-innosetup.sh
232209
if: success() && !env.SKIP_JOB
233210
- name: ensure the build happens on a partition with enough space
234211
run: src/ci/scripts/symlink-build-dir.sh
235-
shell: bash
236212
if: success() && !env.SKIP_JOB
237213
- name: disable git crlf conversion
238214
run: src/ci/scripts/disable-git-crlf-conversion.sh
239-
shell: bash
240215
if: success() && !env.SKIP_JOB
241216
- name: install MSYS2
242217
run: src/ci/scripts/install-msys2.sh
243-
shell: bash
244218
if: success() && !env.SKIP_JOB
245219
- name: install MSYS2 packages
246220
run: src/ci/scripts/install-msys2-packages.sh
247221
if: success() && !env.SKIP_JOB
248222
- name: install MinGW
249223
run: src/ci/scripts/install-mingw.sh
250-
shell: bash
251224
if: success() && !env.SKIP_JOB
252225
- name: install ninja
253226
run: src/ci/scripts/install-ninja.sh
254-
shell: bash
255227
if: success() && !env.SKIP_JOB
256228
- name: enable ipv6 on Docker
257229
run: src/ci/scripts/enable-docker-ipv6.sh
258-
shell: bash
259230
if: success() && !env.SKIP_JOB
260231
- name: disable git crlf conversion
261232
run: src/ci/scripts/disable-git-crlf-conversion.sh
262-
shell: bash
263233
if: success() && !env.SKIP_JOB
264234
- name: checkout submodules
265235
run: src/ci/scripts/checkout-submodules.sh
266-
shell: bash
267236
if: success() && !env.SKIP_JOB
268237
- name: ensure line endings are correct
269238
run: src/ci/scripts/verify-line-endings.sh
270-
shell: bash
271239
if: success() && !env.SKIP_JOB
272240
- name: run the build
273241
run: src/ci/scripts/run-build-from-ci.sh
274-
shell: bash
275242
env:
276243
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
277244
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
278245
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
279246
if: success() && !env.SKIP_JOB
280247
- name: upload artifacts to S3
281248
run: src/ci/scripts/upload-artifacts.sh
282-
shell: bash
283249
env:
284250
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
285251
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -551,10 +517,12 @@ jobs:
551517
os: windows-latest-xl
552518
timeout-minutes: 600
553519
runs-on: "${{ matrix.os }}"
520+
defaults:
521+
run:
522+
shell: bash
554523
steps:
555524
- name: disable git crlf conversion
556525
run: git config --global core.autocrlf false
557-
shell: bash
558526
- name: checkout the source code
559527
uses: actions/checkout@v1
560528
with:
@@ -566,91 +534,72 @@ jobs:
566534
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
567535
- name: add extra environment variables
568536
run: src/ci/scripts/setup-environment.sh
569-
shell: bash
570537
env:
571538
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
572539
if: success() && !env.SKIP_JOB
573540
- name: decide whether to skip this job
574541
run: src/ci/scripts/should-skip-this.sh
575-
shell: bash
576542
if: success() && !env.SKIP_JOB
577543
- name: collect CPU statistics
578544
run: src/ci/scripts/collect-cpu-stats.sh
579-
shell: bash
580545
if: success() && !env.SKIP_JOB
581546
- name: show the current environment
582547
run: src/ci/scripts/dump-environment.sh
583-
shell: bash
584548
if: success() && !env.SKIP_JOB
585549
- name: install awscli
586550
run: src/ci/scripts/install-awscli.sh
587-
shell: bash
588551
if: success() && !env.SKIP_JOB
589552
- name: install sccache
590553
run: src/ci/scripts/install-sccache.sh
591-
shell: bash
592554
if: success() && !env.SKIP_JOB
593555
- name: install clang
594556
run: src/ci/scripts/install-clang.sh
595-
shell: bash
596557
if: success() && !env.SKIP_JOB
597558
- name: install WIX
598559
run: src/ci/scripts/install-wix.sh
599-
shell: bash
600560
if: success() && !env.SKIP_JOB
601561
- name: install InnoSetup
602562
run: src/ci/scripts/install-innosetup.sh
603563
if: success() && !env.SKIP_JOB
604564
- name: ensure the build happens on a partition with enough space
605565
run: src/ci/scripts/symlink-build-dir.sh
606-
shell: bash
607566
if: success() && !env.SKIP_JOB
608567
- name: disable git crlf conversion
609568
run: src/ci/scripts/disable-git-crlf-conversion.sh
610-
shell: bash
611569
if: success() && !env.SKIP_JOB
612570
- name: install MSYS2
613571
run: src/ci/scripts/install-msys2.sh
614-
shell: bash
615572
if: success() && !env.SKIP_JOB
616573
- name: install MSYS2 packages
617574
run: src/ci/scripts/install-msys2-packages.sh
618575
if: success() && !env.SKIP_JOB
619576
- name: install MinGW
620577
run: src/ci/scripts/install-mingw.sh
621-
shell: bash
622578
if: success() && !env.SKIP_JOB
623579
- name: install ninja
624580
run: src/ci/scripts/install-ninja.sh
625-
shell: bash
626581
if: success() && !env.SKIP_JOB
627582
- name: enable ipv6 on Docker
628583
run: src/ci/scripts/enable-docker-ipv6.sh
629-
shell: bash
630584
if: success() && !env.SKIP_JOB
631585
- name: disable git crlf conversion
632586
run: src/ci/scripts/disable-git-crlf-conversion.sh
633-
shell: bash
634587
if: success() && !env.SKIP_JOB
635588
- name: checkout submodules
636589
run: src/ci/scripts/checkout-submodules.sh
637-
shell: bash
638590
if: success() && !env.SKIP_JOB
639591
- name: ensure line endings are correct
640592
run: src/ci/scripts/verify-line-endings.sh
641-
shell: bash
642593
if: success() && !env.SKIP_JOB
643594
- name: run the build
644595
run: src/ci/scripts/run-build-from-ci.sh
645-
shell: bash
646596
env:
647597
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
648598
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
649599
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
650600
if: success() && !env.SKIP_JOB
651601
- name: upload artifacts to S3
652602
run: src/ci/scripts/upload-artifacts.sh
653-
shell: bash
654603
env:
655604
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
656605
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"

0 commit comments

Comments
 (0)