Skip to content

Commit 884ea63

Browse files
ryeMark-Simulacrum
authored andcommittedJul 23, 2020
ci: Replace exec-with-shell wrapper with "plain bash"
Also, promote defaults.run.shell from inside only the primary jobs to the top level. The src/ci/exec-with-shell.py wrapper script was formerly used to change out the shell mid-job by intercepting a CI_OVERRIDE_SHELL environment variable. Now, instead, we just set `bash` as the global default across all jobs, and we also delete the exec-with-shell.py script. Signed-off-by: Kristofer Rye <[email protected]>
1 parent 132887c commit 884ea63

File tree

3 files changed

+5
-41
lines changed

3 files changed

+5
-41
lines changed
 

‎.github/workflows/ci.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ name: CI
2626
- "**"
2727
defaults:
2828
run:
29-
shell: "python src/ci/exec-with-shell.py {0}"
29+
shell: bash
3030
jobs:
3131
pr:
3232
name: PR
@@ -51,9 +51,6 @@ jobs:
5151
os: ubuntu-latest-xl
5252
timeout-minutes: 600
5353
runs-on: "${{ matrix.os }}"
54-
defaults:
55-
run:
56-
shell: bash
5754
steps:
5855
- name: disable git crlf conversion
5956
run: git config --global core.autocrlf false
@@ -163,9 +160,6 @@ jobs:
163160
os: ubuntu-latest-xl
164161
timeout-minutes: 600
165162
runs-on: "${{ matrix.os }}"
166-
defaults:
167-
run:
168-
shell: bash
169163
steps:
170164
- name: disable git crlf conversion
171165
run: git config --global core.autocrlf false
@@ -517,9 +511,6 @@ jobs:
517511
os: windows-latest-xl
518512
timeout-minutes: 600
519513
runs-on: "${{ matrix.os }}"
520-
defaults:
521-
run:
522-
shell: bash
523514
steps:
524515
- name: disable git crlf conversion
525516
run: git config --global core.autocrlf false

‎src/ci/exec-with-shell.py

-16
This file was deleted.

‎src/ci/github-actions/ci.yml

+4-15
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ x--expand-yaml-anchors--remove:
7575
- &base-ci-job
7676
timeout-minutes: 600
7777
runs-on: "${{ matrix.os }}"
78-
defaults:
79-
run:
80-
shell: bash
8178
env: *shared-ci-variables
8279
steps:
8380
- name: disable git crlf conversion
@@ -241,18 +238,10 @@ on:
241238

242239
defaults:
243240
run:
244-
# While on Linux and macOS builders it just forwards the arguments to the
245-
# system bash, this wrapper allows switching from the host's bash.exe to
246-
# the one we install along with MSYS2 mid-build on Windows.
247-
#
248-
# Once the step to install MSYS2 is executed, the CI_OVERRIDE_SHELL
249-
# environment variable is set pointing to our MSYS2's bash.exe. From that
250-
# moment the host's bash.exe will not be called anymore.
251-
#
252-
# This is needed because we can't launch our own bash.exe from the host
253-
# bash.exe, as that would load two different cygwin1.dll in memory, causing
254-
# "cygwin heap mismatch" errors.
255-
shell: python src/ci/exec-with-shell.py {0}
241+
# On Linux, macOS, and Windows, use the system-provided bash as the default
242+
# shell. (This should only make a difference on Windows, where the default
243+
# shell is PowerShell.)
244+
shell: bash
256245

257246
jobs:
258247
pr:

0 commit comments

Comments
 (0)