Skip to content

Commit 1f106b5

Browse files
pietroalbinipietroalbini
committed
ci: set a default shell on GHA
1 parent 4bfd62a commit 1f106b5

File tree

2 files changed

+40
-101
lines changed

2 files changed

+40
-101
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ name: CI
2424
pull_request:
2525
branches:
2626
- "**"
27+
defaults:
28+
run:
29+
shell: "python src/ci/exec-with-shell.py {0}"
2730
jobs:
2831
pr:
2932
name: PR
@@ -68,95 +71,74 @@ jobs:
6871
run: src/ci/scripts/setup-environment.sh
6972
env:
7073
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
71-
shell: "python src/ci/exec-with-shell.py {0}"
7274
if: success() && !env.SKIP_JOB
7375
- name: decide whether to skip this job
7476
run: src/ci/scripts/should-skip-this.sh
75-
shell: "python src/ci/exec-with-shell.py {0}"
7677
if: success() && !env.SKIP_JOB
7778
- name: collect CPU statistics
7879
run: src/ci/scripts/collect-cpu-stats.sh
79-
shell: "python src/ci/exec-with-shell.py {0}"
8080
if: success() && !env.SKIP_JOB
8181
- name: show the current environment
8282
run: src/ci/scripts/dump-environment.sh
83-
shell: "python src/ci/exec-with-shell.py {0}"
8483
if: success() && !env.SKIP_JOB
8584
- name: install awscli
8685
run: src/ci/scripts/install-awscli.sh
87-
shell: "python src/ci/exec-with-shell.py {0}"
8886
if: success() && !env.SKIP_JOB
8987
- name: install sccache
9088
run: src/ci/scripts/install-sccache.sh
91-
shell: "python src/ci/exec-with-shell.py {0}"
9289
if: success() && !env.SKIP_JOB
9390
- name: install clang
9491
run: src/ci/scripts/install-clang.sh
95-
shell: "python src/ci/exec-with-shell.py {0}"
9692
if: success() && !env.SKIP_JOB
9793
- name: install WIX
9894
run: src/ci/scripts/install-wix.sh
99-
shell: "python src/ci/exec-with-shell.py {0}"
10095
if: success() && !env.SKIP_JOB
10196
- name: install InnoSetup
10297
run: src/ci/scripts/install-innosetup.sh
103-
shell: "python src/ci/exec-with-shell.py {0}"
10498
if: success() && !env.SKIP_JOB
10599
- name: ensure the build happens on a partition with enough space
106100
run: src/ci/scripts/symlink-build-dir.sh
107-
shell: "python src/ci/exec-with-shell.py {0}"
108101
if: success() && !env.SKIP_JOB
109102
- name: disable git crlf conversion
110103
run: src/ci/scripts/disable-git-crlf-conversion.sh
111-
shell: "python src/ci/exec-with-shell.py {0}"
112104
if: success() && !env.SKIP_JOB
113105
- name: install MSYS2
114106
run: src/ci/scripts/install-msys2.sh
115-
shell: "python src/ci/exec-with-shell.py {0}"
116107
if: success() && !env.SKIP_JOB
117108
- name: install MSYS2 packages
118109
run: src/ci/scripts/install-msys2-packages.sh
119-
shell: "python src/ci/exec-with-shell.py {0}"
120110
if: success() && !env.SKIP_JOB
121111
- name: install MinGW
122112
run: src/ci/scripts/install-mingw.sh
123-
shell: "python src/ci/exec-with-shell.py {0}"
124113
if: success() && !env.SKIP_JOB
125114
- name: install ninja
126115
run: src/ci/scripts/install-ninja.sh
127-
shell: "python src/ci/exec-with-shell.py {0}"
128116
if: success() && !env.SKIP_JOB
129117
- name: enable ipv6 on Docker
130118
run: src/ci/scripts/enable-docker-ipv6.sh
131-
shell: "python src/ci/exec-with-shell.py {0}"
132119
if: success() && !env.SKIP_JOB
133120
- name: disable git crlf conversion
134121
run: src/ci/scripts/disable-git-crlf-conversion.sh
135-
shell: "python src/ci/exec-with-shell.py {0}"
136122
if: success() && !env.SKIP_JOB
137123
- name: checkout submodules
138124
run: src/ci/scripts/checkout-submodules.sh
139-
shell: "python src/ci/exec-with-shell.py {0}"
140125
if: success() && !env.SKIP_JOB
141126
- name: ensure line endings are correct
142127
run: src/ci/scripts/verify-line-endings.sh
143-
shell: "python src/ci/exec-with-shell.py {0}"
144128
if: success() && !env.SKIP_JOB
145129
- name: run the build
146130
run: src/ci/scripts/run-build-from-ci.sh
147131
env:
148132
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
149133
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
150134
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
151-
shell: "python src/ci/exec-with-shell.py {0}"
152135
if: success() && !env.SKIP_JOB
153136
- name: upload artifacts to S3
154137
run: src/ci/scripts/upload-artifacts.sh
155138
env:
156139
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
157140
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
158141
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
159-
shell: "python src/ci/exec-with-shell.py {0}"
160142
try:
161143
name: try
162144
env:
@@ -201,95 +183,74 @@ jobs:
201183
run: src/ci/scripts/setup-environment.sh
202184
env:
203185
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
204-
shell: "python src/ci/exec-with-shell.py {0}"
205186
if: success() && !env.SKIP_JOB
206187
- name: decide whether to skip this job
207188
run: src/ci/scripts/should-skip-this.sh
208-
shell: "python src/ci/exec-with-shell.py {0}"
209189
if: success() && !env.SKIP_JOB
210190
- name: collect CPU statistics
211191
run: src/ci/scripts/collect-cpu-stats.sh
212-
shell: "python src/ci/exec-with-shell.py {0}"
213192
if: success() && !env.SKIP_JOB
214193
- name: show the current environment
215194
run: src/ci/scripts/dump-environment.sh
216-
shell: "python src/ci/exec-with-shell.py {0}"
217195
if: success() && !env.SKIP_JOB
218196
- name: install awscli
219197
run: src/ci/scripts/install-awscli.sh
220-
shell: "python src/ci/exec-with-shell.py {0}"
221198
if: success() && !env.SKIP_JOB
222199
- name: install sccache
223200
run: src/ci/scripts/install-sccache.sh
224-
shell: "python src/ci/exec-with-shell.py {0}"
225201
if: success() && !env.SKIP_JOB
226202
- name: install clang
227203
run: src/ci/scripts/install-clang.sh
228-
shell: "python src/ci/exec-with-shell.py {0}"
229204
if: success() && !env.SKIP_JOB
230205
- name: install WIX
231206
run: src/ci/scripts/install-wix.sh
232-
shell: "python src/ci/exec-with-shell.py {0}"
233207
if: success() && !env.SKIP_JOB
234208
- name: install InnoSetup
235209
run: src/ci/scripts/install-innosetup.sh
236-
shell: "python src/ci/exec-with-shell.py {0}"
237210
if: success() && !env.SKIP_JOB
238211
- name: ensure the build happens on a partition with enough space
239212
run: src/ci/scripts/symlink-build-dir.sh
240-
shell: "python src/ci/exec-with-shell.py {0}"
241213
if: success() && !env.SKIP_JOB
242214
- name: disable git crlf conversion
243215
run: src/ci/scripts/disable-git-crlf-conversion.sh
244-
shell: "python src/ci/exec-with-shell.py {0}"
245216
if: success() && !env.SKIP_JOB
246217
- name: install MSYS2
247218
run: src/ci/scripts/install-msys2.sh
248-
shell: "python src/ci/exec-with-shell.py {0}"
249219
if: success() && !env.SKIP_JOB
250220
- name: install MSYS2 packages
251221
run: src/ci/scripts/install-msys2-packages.sh
252-
shell: "python src/ci/exec-with-shell.py {0}"
253222
if: success() && !env.SKIP_JOB
254223
- name: install MinGW
255224
run: src/ci/scripts/install-mingw.sh
256-
shell: "python src/ci/exec-with-shell.py {0}"
257225
if: success() && !env.SKIP_JOB
258226
- name: install ninja
259227
run: src/ci/scripts/install-ninja.sh
260-
shell: "python src/ci/exec-with-shell.py {0}"
261228
if: success() && !env.SKIP_JOB
262229
- name: enable ipv6 on Docker
263230
run: src/ci/scripts/enable-docker-ipv6.sh
264-
shell: "python src/ci/exec-with-shell.py {0}"
265231
if: success() && !env.SKIP_JOB
266232
- name: disable git crlf conversion
267233
run: src/ci/scripts/disable-git-crlf-conversion.sh
268-
shell: "python src/ci/exec-with-shell.py {0}"
269234
if: success() && !env.SKIP_JOB
270235
- name: checkout submodules
271236
run: src/ci/scripts/checkout-submodules.sh
272-
shell: "python src/ci/exec-with-shell.py {0}"
273237
if: success() && !env.SKIP_JOB
274238
- name: ensure line endings are correct
275239
run: src/ci/scripts/verify-line-endings.sh
276-
shell: "python src/ci/exec-with-shell.py {0}"
277240
if: success() && !env.SKIP_JOB
278241
- name: run the build
279242
run: src/ci/scripts/run-build-from-ci.sh
280243
env:
281244
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
282245
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
283246
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
284-
shell: "python src/ci/exec-with-shell.py {0}"
285247
if: success() && !env.SKIP_JOB
286248
- name: upload artifacts to S3
287249
run: src/ci/scripts/upload-artifacts.sh
288250
env:
289251
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
290252
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
291253
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
292-
shell: "python src/ci/exec-with-shell.py {0}"
293254
auto:
294255
name: auto
295256
env:
@@ -631,95 +592,74 @@ jobs:
631592
run: src/ci/scripts/setup-environment.sh
632593
env:
633594
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
634-
shell: "python src/ci/exec-with-shell.py {0}"
635595
if: success() && !env.SKIP_JOB
636596
- name: decide whether to skip this job
637597
run: src/ci/scripts/should-skip-this.sh
638-
shell: "python src/ci/exec-with-shell.py {0}"
639598
if: success() && !env.SKIP_JOB
640599
- name: collect CPU statistics
641600
run: src/ci/scripts/collect-cpu-stats.sh
642-
shell: "python src/ci/exec-with-shell.py {0}"
643601
if: success() && !env.SKIP_JOB
644602
- name: show the current environment
645603
run: src/ci/scripts/dump-environment.sh
646-
shell: "python src/ci/exec-with-shell.py {0}"
647604
if: success() && !env.SKIP_JOB
648605
- name: install awscli
649606
run: src/ci/scripts/install-awscli.sh
650-
shell: "python src/ci/exec-with-shell.py {0}"
651607
if: success() && !env.SKIP_JOB
652608
- name: install sccache
653609
run: src/ci/scripts/install-sccache.sh
654-
shell: "python src/ci/exec-with-shell.py {0}"
655610
if: success() && !env.SKIP_JOB
656611
- name: install clang
657612
run: src/ci/scripts/install-clang.sh
658-
shell: "python src/ci/exec-with-shell.py {0}"
659613
if: success() && !env.SKIP_JOB
660614
- name: install WIX
661615
run: src/ci/scripts/install-wix.sh
662-
shell: "python src/ci/exec-with-shell.py {0}"
663616
if: success() && !env.SKIP_JOB
664617
- name: install InnoSetup
665618
run: src/ci/scripts/install-innosetup.sh
666-
shell: "python src/ci/exec-with-shell.py {0}"
667619
if: success() && !env.SKIP_JOB
668620
- name: ensure the build happens on a partition with enough space
669621
run: src/ci/scripts/symlink-build-dir.sh
670-
shell: "python src/ci/exec-with-shell.py {0}"
671622
if: success() && !env.SKIP_JOB
672623
- name: disable git crlf conversion
673624
run: src/ci/scripts/disable-git-crlf-conversion.sh
674-
shell: "python src/ci/exec-with-shell.py {0}"
675625
if: success() && !env.SKIP_JOB
676626
- name: install MSYS2
677627
run: src/ci/scripts/install-msys2.sh
678-
shell: "python src/ci/exec-with-shell.py {0}"
679628
if: success() && !env.SKIP_JOB
680629
- name: install MSYS2 packages
681630
run: src/ci/scripts/install-msys2-packages.sh
682-
shell: "python src/ci/exec-with-shell.py {0}"
683631
if: success() && !env.SKIP_JOB
684632
- name: install MinGW
685633
run: src/ci/scripts/install-mingw.sh
686-
shell: "python src/ci/exec-with-shell.py {0}"
687634
if: success() && !env.SKIP_JOB
688635
- name: install ninja
689636
run: src/ci/scripts/install-ninja.sh
690-
shell: "python src/ci/exec-with-shell.py {0}"
691637
if: success() && !env.SKIP_JOB
692638
- name: enable ipv6 on Docker
693639
run: src/ci/scripts/enable-docker-ipv6.sh
694-
shell: "python src/ci/exec-with-shell.py {0}"
695640
if: success() && !env.SKIP_JOB
696641
- name: disable git crlf conversion
697642
run: src/ci/scripts/disable-git-crlf-conversion.sh
698-
shell: "python src/ci/exec-with-shell.py {0}"
699643
if: success() && !env.SKIP_JOB
700644
- name: checkout submodules
701645
run: src/ci/scripts/checkout-submodules.sh
702-
shell: "python src/ci/exec-with-shell.py {0}"
703646
if: success() && !env.SKIP_JOB
704647
- name: ensure line endings are correct
705648
run: src/ci/scripts/verify-line-endings.sh
706-
shell: "python src/ci/exec-with-shell.py {0}"
707649
if: success() && !env.SKIP_JOB
708650
- name: run the build
709651
run: src/ci/scripts/run-build-from-ci.sh
710652
env:
711653
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
712654
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
713655
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
714-
shell: "python src/ci/exec-with-shell.py {0}"
715656
if: success() && !env.SKIP_JOB
716657
- name: upload artifacts to S3
717658
run: src/ci/scripts/upload-artifacts.sh
718659
env:
719660
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
720661
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
721662
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
722-
shell: "python src/ci/exec-with-shell.py {0}"
723663
master:
724664
name: master
725665
runs-on: ubuntu-latest
@@ -741,7 +681,6 @@ jobs:
741681
run: src/ci/publish_toolstate.sh
742682
env:
743683
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
744-
shell: "python src/ci/exec-with-shell.py {0}"
745684
if: success() && !env.SKIP_JOB
746685
try-success:
747686
needs:

0 commit comments

Comments
 (0)