Rémi Bernon : gitlab: Build every commit in a merge request.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 660aead73f8d84b915f8567d362a2ddf99d97fc4
URL:    https://gitlab.winehq.org/wine/wine/-/commit/660aead73f8d84b915f8567d362a2dd...

Author: Rémi Bernon 
Date:   Thu Aug  4 19:43:07 2022 +0200

gitlab: Build every commit in a merge request.

---

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 1cb674d837a..c8be84ccd67 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
+    - 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

build-winetest:
   extends: .wine-build