]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Do not fail post-merge jobs after force-push
authorPetr Špaček <pspacek@isc.org>
Thu, 25 Sep 2025 10:22:41 +0000 (12:22 +0200)
committerMichał Kępień <michal@isc.org>
Fri, 24 Oct 2025 02:50:00 +0000 (04:50 +0200)
Rebase happens in -sub branches regularly so these failures would
produce log noice.

(cherry picked from commit cbaf4fe6cd234da949c83894c197ceca92ac541b)

.gitlab-ci.yml

index 3fdaf2f936f736b905ed27fb49ded085f9382333..2cc0e7836fd66bc2c11f617dd25e9369fffcb1ea 100644 (file)
@@ -2168,7 +2168,7 @@ pairwise:
     - >
       echo "previous branch tip: $CI_COMMIT_BEFORE_SHA"
     - set +o pipefail; git log --format='%H' | grep --silent "$CI_COMMIT_BEFORE_SHA" && PREVIOUS_TIP_REACHABLE=1
-    - test "$PREVIOUS_TIP_REACHABLE" != "1" && echo "force-push detected, stop" && exit 1
+    - test "$PREVIOUS_TIP_REACHABLE" != "1" && echo "force-push detected, stop" && exit 0
     # non-fast-forward merges are disabled so we have to have merge commit on top
     - MERGE_REQUEST_ID="$(git log -1 --format='%b' | sed --silent -e "s|^See merge request ${CI_PROJECT_PATH}\!||p")"
     - >