From 09aa5bc275fc023aa55c7491f2ab7e8e60bf1935 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Mon, 29 Jan 2024 15:06:13 +0100 Subject: [PATCH] ci: cleanup after failing build-linux-everycommit jobs Those jobs want to start a rebase, but that cannot work when a rebase is already in progress... which can happen since we use the "fetch" Git Strategy (now in Gitlab project CI config), and when such a job fails. We must cleanup things after Signed-off-by: Yann Dirson --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2d51e9..9800be3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -184,6 +184,10 @@ build-linux-everycommit: # failing commit) - git rebase --rebase-merges $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec 'devscripts/gitlab-ci-runbuild.sh cargo build ${FEATURES} ${CARGO_FLAGS}' + after_script: + # since Git Strategy is "fetch", avoid poluting subsequent runs + # (but as of v16.9 it still won't be run on timeout or cancel) + - git rebase --abort || true build-linux: parallel: !reference [.featurematrix,parallel] -- 2.39.5