diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-03-20 20:49:11 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2021-03-21 21:04:42 -0400 |
| commit | 2907949c169a0764676da8e5a4516c705f36932a (patch) | |
| tree | ddc93e7fc3a5d8d0e6512995d974e3fe5206765f | |
| parent | 069abe27324466c27a423f4614f60922e434809d (diff) | |
| download | haskell-2907949c169a0764676da8e5a4516c705f36932a.tar.gz | |
[ci] Default values for GITLAB_CI_BRANCH, and IGNORE_PERF_FAILURESwip/angerman/9.2-forward-ports
| -rwxr-xr-x | .gitlab/ci.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 1b7518c037..cc0369c1a6 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -571,12 +571,12 @@ fi # Ignore performance improvements in @marge-bot batches. # See #19562. -if [ "$GITLAB_CI_BRANCH" == "wip/marge_bot_batch_merge_job" ]; then - if [ -z "$IGNORE_PERF_FAILURES" ]; then +if [ "${GITLAB_CI_BRANCH:-}" == "wip/marge_bot_batch_merge_job" ]; then + if [ -z "${IGNORE_PERF_FAILURES:-}" ]; then IGNORE_PERF_FAILURES="decreases" fi fi -if [ -n "$IGNORE_PERF_FAILURES" ]; then +if [ -n "${IGNORE_PERF_FAILURES:-}" ]; then RUNTEST_ARGS="--ignore-perf-failures=$IGNORE_PERF_FAILURES" fi |