From 6d9230e610b45af209f39abcbff94c849a17d2bd Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Mon, 12 Apr 2021 14:45:35 +0100 Subject: CI: Also ignore metric decreases on master Otherwise, if the marge batch has decreased metrics, they will fail on master which will result in the pipeline being cut short and the expected metric values for the other jobs will not be updated. --- .gitlab/ci.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index c1e666e540..66c52a7c94 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -574,6 +574,14 @@ if [ "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-}" == "wip/marge_bot_batch_merge_jo echo "Ignoring perf failures" fi fi +echo "CI_COMMIT_BRANCH: $CI_COMMIT_BRANCH" +echo "CI_PROJECT_PATH: $CI_PROJECT_PATH" +if [ "${CI_COMMIT_BRANCH:-}" == "master" ] && [ "${CI_PROJECT_PATH:-}" == "ghc/ghc" ]; then + if [ -z "${IGNORE_PERF_FAILURES:-}" ]; then + IGNORE_PERF_FAILURES="decreases" + echo "Ignoring perf failures" + fi +fi if [ -n "${IGNORE_PERF_FAILURES:-}" ]; then RUNTEST_ARGS="--ignore-perf-failures=$IGNORE_PERF_FAILURES" fi -- cgit v1.2.1