Skip to content

Commit ff685f5

Browse files
ManishearthManishearth
authored
Rollup merge of rust-lang#74406 - Mark-Simulacrum:fix-windows-maybe, r=Mark-Simulacrum
Set shell for github actions CI r? @pietroalbini but because this seems at worst harmless and CI is broken self approving
2 parents 043914f + 5b287f6 commit ff685f5

File tree

2 files changed

+97
-0
lines changed

2 files changed

+97
-0
lines changed

‎.github/workflows/ci.yml

+77
Original file line numberDiff line numberDiff line change
@@ -66,66 +66,85 @@ jobs:
6666
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
6767
- name: add extra environment variables
6868
run: src/ci/scripts/setup-environment.sh
69+
shell: bash
6970
env:
7071
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
7172
if: success() && !env.SKIP_JOB
7273
- name: decide whether to skip this job
7374
run: src/ci/scripts/should-skip-this.sh
75+
shell: bash
7476
if: success() && !env.SKIP_JOB
7577
- name: collect CPU statistics
7678
run: src/ci/scripts/collect-cpu-stats.sh
79+
shell: bash
7780
if: success() && !env.SKIP_JOB
7881
- name: show the current environment
7982
run: src/ci/scripts/dump-environment.sh
83+
shell: bash
8084
if: success() && !env.SKIP_JOB
8185
- name: install awscli
8286
run: src/ci/scripts/install-awscli.sh
87+
shell: bash
8388
if: success() && !env.SKIP_JOB
8489
- name: install sccache
8590
run: src/ci/scripts/install-sccache.sh
91+
shell: bash
8692
if: success() && !env.SKIP_JOB
8793
- name: install clang
8894
run: src/ci/scripts/install-clang.sh
95+
shell: bash
8996
if: success() && !env.SKIP_JOB
9097
- name: install WIX
9198
run: src/ci/scripts/install-wix.sh
99+
shell: bash
92100
if: success() && !env.SKIP_JOB
93101
- name: ensure the build happens on a partition with enough space
94102
run: src/ci/scripts/symlink-build-dir.sh
103+
shell: bash
95104
if: success() && !env.SKIP_JOB
96105
- name: disable git crlf conversion
97106
run: src/ci/scripts/disable-git-crlf-conversion.sh
107+
shell: bash
98108
if: success() && !env.SKIP_JOB
99109
- name: install MSYS2
100110
run: src/ci/scripts/install-msys2.sh
111+
shell: bash
101112
if: success() && !env.SKIP_JOB
102113
- name: install MinGW
103114
run: src/ci/scripts/install-mingw.sh
115+
shell: bash
104116
if: success() && !env.SKIP_JOB
105117
- name: install ninja
106118
run: src/ci/scripts/install-ninja.sh
119+
shell: bash
107120
if: success() && !env.SKIP_JOB
108121
- name: enable ipv6 on Docker
109122
run: src/ci/scripts/enable-docker-ipv6.sh
123+
shell: bash
110124
if: success() && !env.SKIP_JOB
111125
- name: disable git crlf conversion
112126
run: src/ci/scripts/disable-git-crlf-conversion.sh
127+
shell: bash
113128
if: success() && !env.SKIP_JOB
114129
- name: checkout submodules
115130
run: src/ci/scripts/checkout-submodules.sh
131+
shell: bash
116132
if: success() && !env.SKIP_JOB
117133
- name: ensure line endings are correct
118134
run: src/ci/scripts/verify-line-endings.sh
135+
shell: bash
119136
if: success() && !env.SKIP_JOB
120137
- name: run the build
121138
run: src/ci/scripts/run-build-from-ci.sh
139+
shell: bash
122140
env:
123141
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
124142
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
125143
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
126144
if: success() && !env.SKIP_JOB
127145
- name: upload artifacts to S3
128146
run: src/ci/scripts/upload-artifacts.sh
147+
shell: bash
129148
env:
130149
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
131150
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -166,66 +185,85 @@ jobs:
166185
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
167186
- name: add extra environment variables
168187
run: src/ci/scripts/setup-environment.sh
188+
shell: bash
169189
env:
170190
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
171191
if: success() && !env.SKIP_JOB
172192
- name: decide whether to skip this job
173193
run: src/ci/scripts/should-skip-this.sh
194+
shell: bash
174195
if: success() && !env.SKIP_JOB
175196
- name: collect CPU statistics
176197
run: src/ci/scripts/collect-cpu-stats.sh
198+
shell: bash
177199
if: success() && !env.SKIP_JOB
178200
- name: show the current environment
179201
run: src/ci/scripts/dump-environment.sh
202+
shell: bash
180203
if: success() && !env.SKIP_JOB
181204
- name: install awscli
182205
run: src/ci/scripts/install-awscli.sh
206+
shell: bash
183207
if: success() && !env.SKIP_JOB
184208
- name: install sccache
185209
run: src/ci/scripts/install-sccache.sh
210+
shell: bash
186211
if: success() && !env.SKIP_JOB
187212
- name: install clang
188213
run: src/ci/scripts/install-clang.sh
214+
shell: bash
189215
if: success() && !env.SKIP_JOB
190216
- name: install WIX
191217
run: src/ci/scripts/install-wix.sh
218+
shell: bash
192219
if: success() && !env.SKIP_JOB
193220
- name: ensure the build happens on a partition with enough space
194221
run: src/ci/scripts/symlink-build-dir.sh
222+
shell: bash
195223
if: success() && !env.SKIP_JOB
196224
- name: disable git crlf conversion
197225
run: src/ci/scripts/disable-git-crlf-conversion.sh
226+
shell: bash
198227
if: success() && !env.SKIP_JOB
199228
- name: install MSYS2
200229
run: src/ci/scripts/install-msys2.sh
230+
shell: bash
201231
if: success() && !env.SKIP_JOB
202232
- name: install MinGW
203233
run: src/ci/scripts/install-mingw.sh
234+
shell: bash
204235
if: success() && !env.SKIP_JOB
205236
- name: install ninja
206237
run: src/ci/scripts/install-ninja.sh
238+
shell: bash
207239
if: success() && !env.SKIP_JOB
208240
- name: enable ipv6 on Docker
209241
run: src/ci/scripts/enable-docker-ipv6.sh
242+
shell: bash
210243
if: success() && !env.SKIP_JOB
211244
- name: disable git crlf conversion
212245
run: src/ci/scripts/disable-git-crlf-conversion.sh
246+
shell: bash
213247
if: success() && !env.SKIP_JOB
214248
- name: checkout submodules
215249
run: src/ci/scripts/checkout-submodules.sh
250+
shell: bash
216251
if: success() && !env.SKIP_JOB
217252
- name: ensure line endings are correct
218253
run: src/ci/scripts/verify-line-endings.sh
254+
shell: bash
219255
if: success() && !env.SKIP_JOB
220256
- name: run the build
221257
run: src/ci/scripts/run-build-from-ci.sh
258+
shell: bash
222259
env:
223260
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
224261
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
225262
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
226263
if: success() && !env.SKIP_JOB
227264
- name: upload artifacts to S3
228265
run: src/ci/scripts/upload-artifacts.sh
266+
shell: bash
229267
env:
230268
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
231269
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -484,66 +522,85 @@ jobs:
484522
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
485523
- name: add extra environment variables
486524
run: src/ci/scripts/setup-environment.sh
525+
shell: bash
487526
env:
488527
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
489528
if: success() && !env.SKIP_JOB
490529
- name: decide whether to skip this job
491530
run: src/ci/scripts/should-skip-this.sh
531+
shell: bash
492532
if: success() && !env.SKIP_JOB
493533
- name: collect CPU statistics
494534
run: src/ci/scripts/collect-cpu-stats.sh
535+
shell: bash
495536
if: success() && !env.SKIP_JOB
496537
- name: show the current environment
497538
run: src/ci/scripts/dump-environment.sh
539+
shell: bash
498540
if: success() && !env.SKIP_JOB
499541
- name: install awscli
500542
run: src/ci/scripts/install-awscli.sh
543+
shell: bash
501544
if: success() && !env.SKIP_JOB
502545
- name: install sccache
503546
run: src/ci/scripts/install-sccache.sh
547+
shell: bash
504548
if: success() && !env.SKIP_JOB
505549
- name: install clang
506550
run: src/ci/scripts/install-clang.sh
551+
shell: bash
507552
if: success() && !env.SKIP_JOB
508553
- name: install WIX
509554
run: src/ci/scripts/install-wix.sh
555+
shell: bash
510556
if: success() && !env.SKIP_JOB
511557
- name: ensure the build happens on a partition with enough space
512558
run: src/ci/scripts/symlink-build-dir.sh
559+
shell: bash
513560
if: success() && !env.SKIP_JOB
514561
- name: disable git crlf conversion
515562
run: src/ci/scripts/disable-git-crlf-conversion.sh
563+
shell: bash
516564
if: success() && !env.SKIP_JOB
517565
- name: install MSYS2
518566
run: src/ci/scripts/install-msys2.sh
567+
shell: bash
519568
if: success() && !env.SKIP_JOB
520569
- name: install MinGW
521570
run: src/ci/scripts/install-mingw.sh
571+
shell: bash
522572
if: success() && !env.SKIP_JOB
523573
- name: install ninja
524574
run: src/ci/scripts/install-ninja.sh
575+
shell: bash
525576
if: success() && !env.SKIP_JOB
526577
- name: enable ipv6 on Docker
527578
run: src/ci/scripts/enable-docker-ipv6.sh
579+
shell: bash
528580
if: success() && !env.SKIP_JOB
529581
- name: disable git crlf conversion
530582
run: src/ci/scripts/disable-git-crlf-conversion.sh
583+
shell: bash
531584
if: success() && !env.SKIP_JOB
532585
- name: checkout submodules
533586
run: src/ci/scripts/checkout-submodules.sh
587+
shell: bash
534588
if: success() && !env.SKIP_JOB
535589
- name: ensure line endings are correct
536590
run: src/ci/scripts/verify-line-endings.sh
591+
shell: bash
537592
if: success() && !env.SKIP_JOB
538593
- name: run the build
539594
run: src/ci/scripts/run-build-from-ci.sh
595+
shell: bash
540596
env:
541597
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
542598
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
543599
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
544600
if: success() && !env.SKIP_JOB
545601
- name: upload artifacts to S3
546602
run: src/ci/scripts/upload-artifacts.sh
603+
shell: bash
547604
env:
548605
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
549606
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -610,66 +667,85 @@ jobs:
610667
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
611668
- name: add extra environment variables
612669
run: src/ci/scripts/setup-environment.sh
670+
shell: bash
613671
env:
614672
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
615673
if: success() && !env.SKIP_JOB
616674
- name: decide whether to skip this job
617675
run: src/ci/scripts/should-skip-this.sh
676+
shell: bash
618677
if: success() && !env.SKIP_JOB
619678
- name: collect CPU statistics
620679
run: src/ci/scripts/collect-cpu-stats.sh
680+
shell: bash
621681
if: success() && !env.SKIP_JOB
622682
- name: show the current environment
623683
run: src/ci/scripts/dump-environment.sh
684+
shell: bash
624685
if: success() && !env.SKIP_JOB
625686
- name: install awscli
626687
run: src/ci/scripts/install-awscli.sh
688+
shell: bash
627689
if: success() && !env.SKIP_JOB
628690
- name: install sccache
629691
run: src/ci/scripts/install-sccache.sh
692+
shell: bash
630693
if: success() && !env.SKIP_JOB
631694
- name: install clang
632695
run: src/ci/scripts/install-clang.sh
696+
shell: bash
633697
if: success() && !env.SKIP_JOB
634698
- name: install WIX
635699
run: src/ci/scripts/install-wix.sh
700+
shell: bash
636701
if: success() && !env.SKIP_JOB
637702
- name: ensure the build happens on a partition with enough space
638703
run: src/ci/scripts/symlink-build-dir.sh
704+
shell: bash
639705
if: success() && !env.SKIP_JOB
640706
- name: disable git crlf conversion
641707
run: src/ci/scripts/disable-git-crlf-conversion.sh
708+
shell: bash
642709
if: success() && !env.SKIP_JOB
643710
- name: install MSYS2
644711
run: src/ci/scripts/install-msys2.sh
712+
shell: bash
645713
if: success() && !env.SKIP_JOB
646714
- name: install MinGW
647715
run: src/ci/scripts/install-mingw.sh
716+
shell: bash
648717
if: success() && !env.SKIP_JOB
649718
- name: install ninja
650719
run: src/ci/scripts/install-ninja.sh
720+
shell: bash
651721
if: success() && !env.SKIP_JOB
652722
- name: enable ipv6 on Docker
653723
run: src/ci/scripts/enable-docker-ipv6.sh
724+
shell: bash
654725
if: success() && !env.SKIP_JOB
655726
- name: disable git crlf conversion
656727
run: src/ci/scripts/disable-git-crlf-conversion.sh
728+
shell: bash
657729
if: success() && !env.SKIP_JOB
658730
- name: checkout submodules
659731
run: src/ci/scripts/checkout-submodules.sh
732+
shell: bash
660733
if: success() && !env.SKIP_JOB
661734
- name: ensure line endings are correct
662735
run: src/ci/scripts/verify-line-endings.sh
736+
shell: bash
663737
if: success() && !env.SKIP_JOB
664738
- name: run the build
665739
run: src/ci/scripts/run-build-from-ci.sh
740+
shell: bash
666741
env:
667742
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
668743
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
669744
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
670745
if: success() && !env.SKIP_JOB
671746
- name: upload artifacts to S3
672747
run: src/ci/scripts/upload-artifacts.sh
748+
shell: bash
673749
env:
674750
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
675751
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -694,6 +770,7 @@ jobs:
694770
fetch-depth: 2
695771
- name: publish toolstate
696772
run: src/ci/publish_toolstate.sh
773+
shell: bash
697774
env:
698775
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
699776
if: success() && !env.SKIP_JOB

0 commit comments

Comments
 (0)