about summary refs log tree commit diff
path: root/.github/workflows
diff options
context:
space:
mode:
authorKristofer Rye <kristofer.rye@gmail.com>2020-07-17 08:44:14 -0500
committerKristofer Rye <kristofer.rye@gmail.com>2020-07-17 08:44:14 -0500
commit586629c0b607f34981a893cf856bb35279f58542 (patch)
tree12f52efe17282324176b5153427d426a98cca381 /.github/workflows
parent49f50780480421e524adf6262a285003d6f8281e (diff)
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 <kristofer.rye@gmail.com>
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/ci.yml14
1 files changed, 1 insertions, 13 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cf0f4dbd1e..86de3782000 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ name: CI
       - "**"
 defaults:
   run:
-    shell: "python src/ci/exec-with-shell.py {0}"
+    shell: bash
 jobs:
   pr:
     name: PR
@@ -51,9 +51,6 @@ jobs:
             os: ubuntu-latest-xl
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
-    defaults:
-      run:
-        shell: bash
     steps:
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
@@ -153,9 +150,6 @@ jobs:
             env: {}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
-    defaults:
-      run:
-        shell: bash
     steps:
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
@@ -473,9 +467,6 @@ jobs:
             os: windows-latest-xl
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
-    defaults:
-      run:
-        shell: bash
     steps:
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
@@ -601,9 +592,6 @@ jobs:
             os: macos-latest
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
-    defaults:
-      run:
-        shell: bash
     steps:
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false