From b4c64ba8eaf7b48399506b9082270826424e1b2c Mon Sep 17 00:00:00 2001
From: Sergiusz Bazanski <q3k@q3k.org>
Date: Sat, 3 Aug 2019 17:57:59 +0200
Subject: [PATCH] ci: notify user when branch is too far off master to be
analyzed
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3aa7f70..f63edb91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ lint:
- curl --fail https://annoyatron-prod.q3k.org/ping/mr?mr=${CI_MERGE_REQUEST_IID}
- git remote rm card10 || true # old gitlab runners might have this remote.
- git fetch https://git.card10.badge.events.ccc.de/card10/firmware.git master:card10/master
+ - git merge-base --fork-point card10/master || ( echo "Your change needs to be rebased against current master."; exit 1; )
- git diff --name-only $(git merge-base --fork-point card10/master)...HEAD | xargs tools/code-style.sh
- git diff --exit-code
only:
--
GitLab