gitlab: Build every commit in a merge request.

660aead7 · Rémi Bernon · Alexandre Julliard · f1a7a16b · 660aead7
Commit 660aead7 authored Aug 04, 2022 by Rémi Bernon Committed by Alexandre Julliard Aug 05, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

build.yml tools/gitlab/build.yml +2 -1

No files found.
--- 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