From 2dd4211b77724cc14fc1b521788111efb578cc39 Mon Sep 17 00:00:00 2001
From: Giovanni Mascellani <gmascellani@codeweavers.com>
Date: Fri, 22 Sep 2023 10:51:48 +0200
Subject: [PATCH] ci: Wrap complex commands in CI scripts.

---
 gitlab/build-crosstest | 4 +++-
 gitlab/build-linux     | 5 ++++-
 gitlab/build-mac       | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest
index d5f6ae00..7963e58b 100755
--- a/gitlab/build-crosstest
+++ b/gitlab/build-crosstest
@@ -14,7 +14,9 @@ set -Eeuxo pipefail
 rm -fr build
 mkdir build
 cd build
-../configure CROSSCC32="i686-w64-mingw32-gcc -Wno-array-bounds" CROSSCC64="x86_64-w64-mingw32-gcc -Wno-array-bounds" && make -j$(nproc) crosstest || touch ../pipeline_failed
+../configure CROSSCC32="i686-w64-mingw32-gcc -Wno-array-bounds" CROSSCC64="x86_64-w64-mingw32-gcc -Wno-array-bounds" && \
+    make -j$(nproc) crosstest || \
+        touch ../pipeline_failed
 
 mkdir -p ../artifacts/$COMMIT
 rsync -Rr tests/*.exe ../artifacts/$COMMIT
diff --git a/gitlab/build-linux b/gitlab/build-linux
index b6071ef9..318bbba4 100755
--- a/gitlab/build-linux
+++ b/gitlab/build-linux
@@ -11,7 +11,10 @@ set -Eeuxo pipefail
 rm -fr build
 mkdir build
 cd build
-../configure --enable-demos && make -j$(nproc) && make -j$(nproc) check || touch ../pipeline_failed
+../configure --enable-demos && \
+    make -j$(nproc) && \
+    make -j$(nproc) check || \
+        touch ../pipeline_failed
 
 mkdir -p ../artifacts/$COMMIT
 rsync -Rr doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT
diff --git a/gitlab/build-mac b/gitlab/build-mac
index 401bdc5a..ffa46d67 100755
--- a/gitlab/build-mac
+++ b/gitlab/build-mac
@@ -11,7 +11,10 @@ set -Eeuxo pipefail
 rm -fr build
 mkdir build
 cd build
-../configure && make -j$(sysctl -n hw.ncpu) && make -j$(sysctl -n hw.ncpu) check || touch ../pipeline_failed
+../configure && \
+    make -j$(sysctl -n hw.ncpu) && \
+    make -j$(sysctl -n hw.ncpu) check || \
+        touch ../pipeline_failed
 
 mkdir -p ../artifacts/$COMMIT
 rsync -Rr test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT