summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab')
-rwxr-xr-x.gitlab/ci.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 8cebcd1d71..df43491c5b 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -46,6 +46,9 @@ Environment variables affecting both build systems:
VERBOSE Set to non-empty for verbose build output
RUNTEST_ARGS Arguments passed to runtest.py
MSYSTEM (Windows-only) Which platform to build form (MINGW64 or MINGW32).
+ IGNORE_PERF_FAILURES
+ Whether to ignore perf failures (one of "increases",
+ "decreases", or "all")
Environment variables determining build configuration of Make system:
@@ -562,6 +565,17 @@ if [ -n "$CROSS_TARGET" ]; then
target_triple="$CROSS_TARGET"
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
+ IGNORE_PERF_FAILURES="decreases"
+ fi
+fi
+if [ -n "$IGNORE_PERF_FAILURES" ]; then
+ RUNTEST_ARGS="--ignore-perf-failures=$IGNORE_PERF_FAILURES"
+fi
+
set_toolchain_paths
case $1 in