Skip to content

Commit 59e3a05

Browse files
Manishearthehuss
Manishearth
authored and
ehuss
committed
Rollup merge of #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
1 parent 6a070f2 commit 59e3a05

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)] }}"
@@ -478,66 +516,85 @@ jobs:
478516
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
479517
- name: add extra environment variables
480518
run: src/ci/scripts/setup-environment.sh
519+
shell: bash
481520
env:
482521
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
483522
if: success() && !env.SKIP_JOB
484523
- name: decide whether to skip this job
485524
run: src/ci/scripts/should-skip-this.sh
525+
shell: bash
486526
if: success() && !env.SKIP_JOB
487527
- name: collect CPU statistics
488528
run: src/ci/scripts/collect-cpu-stats.sh
529+
shell: bash
489530
if: success() && !env.SKIP_JOB
490531
- name: show the current environment
491532
run: src/ci/scripts/dump-environment.sh
533+
shell: bash
492534
if: success() && !env.SKIP_JOB
493535
- name: install awscli
494536
run: src/ci/scripts/install-awscli.sh
537+
shell: bash
495538
if: success() && !env.SKIP_JOB
496539
- name: install sccache
497540
run: src/ci/scripts/install-sccache.sh
541+
shell: bash
498542
if: success() && !env.SKIP_JOB
499543
- name: install clang
500544
run: src/ci/scripts/install-clang.sh
545+
shell: bash
501546
if: success() && !env.SKIP_JOB
502547
- name: install WIX
503548
run: src/ci/scripts/install-wix.sh
549+
shell: bash
504550
if: success() && !env.SKIP_JOB
505551
- name: ensure the build happens on a partition with enough space
506552
run: src/ci/scripts/symlink-build-dir.sh
553+
shell: bash
507554
if: success() && !env.SKIP_JOB
508555
- name: disable git crlf conversion
509556
run: src/ci/scripts/disable-git-crlf-conversion.sh
557+
shell: bash
510558
if: success() && !env.SKIP_JOB
511559
- name: install MSYS2
512560
run: src/ci/scripts/install-msys2.sh
561+
shell: bash
513562
if: success() && !env.SKIP_JOB
514563
- name: install MinGW
515564
run: src/ci/scripts/install-mingw.sh
565+
shell: bash
516566
if: success() && !env.SKIP_JOB
517567
- name: install ninja
518568
run: src/ci/scripts/install-ninja.sh
569+
shell: bash
519570
if: success() && !env.SKIP_JOB
520571
- name: enable ipv6 on Docker
521572
run: src/ci/scripts/enable-docker-ipv6.sh
573+
shell: bash
522574
if: success() && !env.SKIP_JOB
523575
- name: disable git crlf conversion
524576
run: src/ci/scripts/disable-git-crlf-conversion.sh
577+
shell: bash
525578
if: success() && !env.SKIP_JOB
526579
- name: checkout submodules
527580
run: src/ci/scripts/checkout-submodules.sh
581+
shell: bash
528582
if: success() && !env.SKIP_JOB
529583
- name: ensure line endings are correct
530584
run: src/ci/scripts/verify-line-endings.sh
585+
shell: bash
531586
if: success() && !env.SKIP_JOB
532587
- name: run the build
533588
run: src/ci/scripts/run-build-from-ci.sh
589+
shell: bash
534590
env:
535591
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
536592
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
537593
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
538594
if: success() && !env.SKIP_JOB
539595
- name: upload artifacts to S3
540596
run: src/ci/scripts/upload-artifacts.sh
597+
shell: bash
541598
env:
542599
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
543600
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -604,66 +661,85 @@ jobs:
604661
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
605662
- name: add extra environment variables
606663
run: src/ci/scripts/setup-environment.sh
664+
shell: bash
607665
env:
608666
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
609667
if: success() && !env.SKIP_JOB
610668
- name: decide whether to skip this job
611669
run: src/ci/scripts/should-skip-this.sh
670+
shell: bash
612671
if: success() && !env.SKIP_JOB
613672
- name: collect CPU statistics
614673
run: src/ci/scripts/collect-cpu-stats.sh
674+
shell: bash
615675
if: success() && !env.SKIP_JOB
616676
- name: show the current environment
617677
run: src/ci/scripts/dump-environment.sh
678+
shell: bash
618679
if: success() && !env.SKIP_JOB
619680
- name: install awscli
620681
run: src/ci/scripts/install-awscli.sh
682+
shell: bash
621683
if: success() && !env.SKIP_JOB
622684
- name: install sccache
623685
run: src/ci/scripts/install-sccache.sh
686+
shell: bash
624687
if: success() && !env.SKIP_JOB
625688
- name: install clang
626689
run: src/ci/scripts/install-clang.sh
690+
shell: bash
627691
if: success() && !env.SKIP_JOB
628692
- name: install WIX
629693
run: src/ci/scripts/install-wix.sh
694+
shell: bash
630695
if: success() && !env.SKIP_JOB
631696
- name: ensure the build happens on a partition with enough space
632697
run: src/ci/scripts/symlink-build-dir.sh
698+
shell: bash
633699
if: success() && !env.SKIP_JOB
634700
- name: disable git crlf conversion
635701
run: src/ci/scripts/disable-git-crlf-conversion.sh
702+
shell: bash
636703
if: success() && !env.SKIP_JOB
637704
- name: install MSYS2
638705
run: src/ci/scripts/install-msys2.sh
706+
shell: bash
639707
if: success() && !env.SKIP_JOB
640708
- name: install MinGW
641709
run: src/ci/scripts/install-mingw.sh
710+
shell: bash
642711
if: success() && !env.SKIP_JOB
643712
- name: install ninja
644713
run: src/ci/scripts/install-ninja.sh
714+
shell: bash
645715
if: success() && !env.SKIP_JOB
646716
- name: enable ipv6 on Docker
647717
run: src/ci/scripts/enable-docker-ipv6.sh
718+
shell: bash
648719
if: success() && !env.SKIP_JOB
649720
- name: disable git crlf conversion
650721
run: src/ci/scripts/disable-git-crlf-conversion.sh
722+
shell: bash
651723
if: success() && !env.SKIP_JOB
652724
- name: checkout submodules
653725
run: src/ci/scripts/checkout-submodules.sh
726+
shell: bash
654727
if: success() && !env.SKIP_JOB
655728
- name: ensure line endings are correct
656729
run: src/ci/scripts/verify-line-endings.sh
730+
shell: bash
657731
if: success() && !env.SKIP_JOB
658732
- name: run the build
659733
run: src/ci/scripts/run-build-from-ci.sh
734+
shell: bash
660735
env:
661736
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
662737
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
663738
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
664739
if: success() && !env.SKIP_JOB
665740
- name: upload artifacts to S3
666741
run: src/ci/scripts/upload-artifacts.sh
742+
shell: bash
667743
env:
668744
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
669745
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
@@ -688,6 +764,7 @@ jobs:
688764
fetch-depth: 2
689765
- name: publish toolstate
690766
run: src/ci/publish_toolstate.sh
767+
shell: bash
691768
env:
692769
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
693770
if: success() && !env.SKIP_JOB

0 commit comments

Comments
 (0)