diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-04-08 10:16:47 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-04-10 05:33:03 -0400 |
| commit | 94d48ec9fe45672f1ade2722fef709d3eac93e66 (patch) | |
| tree | e0ce705afe4295f72583374ebd313fb293ba3f62 | |
| parent | b39dec86df8106a2bb4770758941572073ad57a2 (diff) | |
| download | haskell-94d48ec9fe45672f1ade2722fef709d3eac93e66.tar.gz | |
Use CI_MERGE_REQUEST_SOURCE_BRANCH_NAME rather than undefined GITLAB_CI_BRANCH env var
See https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
| -rwxr-xr-x | .gitlab/ci.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 68be7c8b2e..c1e666e540 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -565,11 +565,13 @@ if [ -n "$CROSS_TARGET" ]; then target_triple="$CROSS_TARGET" fi +echo "Branch name $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" # Ignore performance improvements in @marge-bot batches. # See #19562. -if [ "${GITLAB_CI_BRANCH:-}" == "wip/marge_bot_batch_merge_job" ]; then +if [ "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-}" == "wip/marge_bot_batch_merge_job" ]; then if [ -z "${IGNORE_PERF_FAILURES:-}" ]; then IGNORE_PERF_FAILURES="decreases" + echo "Ignoring perf failures" fi fi if [ -n "${IGNORE_PERF_FAILURES:-}" ]; then |