diff options
| author | bors <bors@rust-lang.org> | 2020-04-30 15:35:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-30 15:35:16 +0000 |
| commit | be8589fc31162bb71b0f765beba6ce73ec8ba93a (patch) | |
| tree | e9edc116a3d6a52d134a3133bfdf3a046f08fc78 | |
| parent | eece58a8e35c444afba6fa34873bc0244e32cd29 (diff) | |
| parent | fde5811d7403f1e1f0ff5ccf1d1d0516d6d3c966 (diff) | |
| download | rust-be8589fc31162bb71b0f765beba6ce73ec8ba93a.tar.gz rust-be8589fc31162bb71b0f765beba6ce73ec8ba93a.zip | |
Auto merge of #71675 - pietroalbini:ci-fix-shrink-regression, r=Mark-Simulacrum
ci: use bash when executing the "bors build finished" jobs We don't clone the repository in those builders, so the default shell (`src/ci/exec-with-shell.py`) is not present there. This fixes a GHA regression introduced in #71434. r? @Mark-Simulacrum
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e00fb0ac51..366ea0ebbe5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -624,6 +624,7 @@ jobs: steps: - name: mark the job as a success run: exit 0 + shell: bash name: bors build finished runs-on: ubuntu-latest try-failure: @@ -633,6 +634,7 @@ jobs: steps: - name: mark the job as a failure run: exit 1 + shell: bash name: bors build finished runs-on: ubuntu-latest auto-success: @@ -642,6 +644,7 @@ jobs: steps: - name: mark the job as a success run: exit 0 + shell: bash name: bors build finished runs-on: ubuntu-latest auto-failure: @@ -651,5 +654,6 @@ jobs: steps: - name: mark the job as a failure run: exit 1 + shell: bash name: bors build finished runs-on: ubuntu-latest diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 74581232af7..647da7c8a7e 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -210,12 +210,14 @@ x--expand-yaml-anchors--remove: steps: - name: mark the job as a success run: exit 0 + shell: bash <<: *base-outcome-job - &base-failure-job steps: - name: mark the job as a failure run: exit 1 + shell: bash <<: *base-outcome-job ########################### |