From e74beecc0922dbcc9474e912f2f4db79a13c1240 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sun, 4 Aug 2019 18:16:04 +0200
Subject: [PATCH] ci: Fix lint chocking on deleted files
Signed-off-by: Rahix <rahix@rahix.de>
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f63edb91..0a626b30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,8 +22,8 @@ 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 merge-base card10/master HEAD || ( echo "Your change needs to be rebased against current master."; exit 1; )
+ - git diff --name-only --diff-filter=d card10/master...HEAD | xargs tools/code-style.sh
- git diff --exit-code
only:
- merge_requests
--
GitLab