diff --git a/tools/gitlab/build-all b/tools/gitlab/build-all
new file mode 100755
index 00000000000..351e100b4f8
--- /dev/null
+++ b/tools/gitlab/build-all
@@ -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..1cb674d837a 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
 
 build-winetest:
   extends: .wine-build