[PATCH 2/2] tools/gitlab: Build every commit in a merge request.

[Rémi Bernon]

From: R��mi Bernon

---
 tools/gitlab/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml
index 3b3a6d99287..fbd13a09b0f 100644
--- a/tools/gitlab/build.yml
+++ b/tools/gitlab/build.yml
@@ -30,7 +30,8 @@ build-all:
       - build64/config.log
       - build32/config.log
   script:
-    - ./tools/gitlab/build-all.sh
+    - rm -fr ".git/rebase-merge" # in case a previous CI run failed in git rebase
+    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./tools/gitlab/build-all.sh

build-winetest:
   extends: .wine-build