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

[Rémi Bernon (＠rbernon)]

Instead of just the last one, which may later cause intermediate build failures. Marvin currently avoid that, and IMHO it would be better not to lose the feature.

[PATCH 1/2] tools/gitlab: Move build steps to build-all.sh.

[Rémi Bernon]

From: R��mi Bernon

---
 tools/gitlab/build-all.sh | 22 ++++++++++++++++++++++
 tools/gitlab/build.yml    | 10 +---------
 2 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100755 tools/gitlab/build-all.sh

diff --git a/tools/gitlab/build-all.sh b/tools/gitlab/build-all.sh
new file mode 100755
index 00000000000..351e100b4f8
--- /dev/null
+++ b/tools/gitlab/build-all.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+echo "Building $(git log -1)"
+echo "---"
+
+set -Eeuxo pipefail
+
+./tools/make_requests
+./tools/make_makefiles
+autoreconf
+
+cd build64
+../configure -C --enable-win64 --enable-werror --with-mingw
+make -s -j$(nproc)
+cd ..
+
+cd build32
+../configure -C --enable-werror --with-mingw
+make -s -j$(nproc)
+cd ..
+
+git reset --hard
diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml
index 4f1ff0eddc5..3b3a6d99287 100644
--- a/tools/gitlab/build.yml
+++ b/tools/gitlab/build.yml
@@ -30,15 +30,7 @@ build-all:
       - build64/config.log
       - build32/config.log
   script:
-    - ./tools/make_requests
-    - ./tools/make_makefiles
-    - autoreconf
-    - cd build64
-    - ../configure -C --enable-win64 --enable-werror --with-mingw
-    - make -s -j$(nproc)
-    - cd ../build32
-    - ../configure -C --enable-werror --with-mingw
-    - make -s -j$(nproc)
+    - ./tools/gitlab/build-all.sh

build-winetest:
   extends: .wine-build

[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

[Rémi Bernon (＠rbernon)]

FWIW it looks like the CI keeps some state between runs. I didn't investigate, and maybe it speeds up builds, but I think it's not great in general and can cause trouble in the future. Maybe this should also do `git clean -fdx` in addition to `git reset --hard` but it would cleanup build dirs, and ccache.