From 629e3b038739b200d6745de9ee3b9eb3ef6a15b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Mon, 4 Nov 2019 11:30:07 +0100
Subject: [PATCH] Check that the commit doesn't have the old original commit as
 ancestor

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf23ee36cd2..852d7474b3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,14 @@ variables:
     DEFAULT: "master"
     FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
 
+check-no-old-frama-c:
+  stage: git-update
+  script:
+   - ! git merge-base --is-ancestor a1e186c68a6418a53b3dc06237f49e8dcbf75f4a HEAD
+   - git merge-base --is-ancestor a35d2118fe6999dddce9e1847eff626fae9cc37c HEAD
+  tags:
+   - nix
+
 #avoid a nix error https://github.com/NixOS/nix/issues/2087
 git-update:
   stage: git-update
-- 
GitLab