Merge branch 'johannes/unbreak-ci' into 'master'

Stop CI on first error

See merge request postmarketOS/buffybox!44

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 build-and-test-with-drm:
   image: alpine:3.19
   script:
+    - set -e # Stop on first error
     - apk -q add git bash build-base meson linux-headers inih-dev libinput-dev libxkbcommon-dev libdrm-dev scdoc
     - git submodule init
     - git submodule update
@@ -9,6 +10,7 @@ build-and-test-with-drm:
 build-and-test-without-drm:
   image: alpine:3.19
   script:
+    - set -e # Stop on first error
     - apk -q add git bash build-base meson linux-headers inih-dev libinput-dev libxkbcommon-dev scdoc
     - git submodule init
     - git submodule update
@@ -17,6 +19,7 @@ build-and-test-without-drm:
 build-iskey:
   image: alpine:3.19
   script:
+    - set -e # Stop on first error
     - apk -q add git bash build-base meson linux-headers libevdev-dev
     - cd iskey
     - meson setup _build

test/helpers.sh

@@ -58,8 +58,10 @@ function ok() {
 
 function run_script() {
     info "Executing $1"
-    "$1"
+    rc=0
+    "$1" || rc=1
     echo
+    return $rc
 }
 
 function read_version_from_meson() {

test/test-with-drm.sh

@@ -4,8 +4,12 @@ root=$(dirname "${BASH_SOURCE[0]}")
 
 source "$root/helpers.sh"
 
-run_script "$root/build-with-drm.sh"
-run_script "$root/test-version-matches-meson-and-changelog.sh"
-run_script "$root/test-uses-fb-backend-by-default.sh"
-run_script "$root/test-uses-fb-backend-if-selected-via-config.sh"
-run_script "$root/test-uses-drm-backend-if-selected-via-config-and-available.sh"
+rc=0
+
+run_script "$root/build-with-drm.sh" || rc=1
+run_script "$root/test-version-matches-meson-and-changelog.sh" || rc=1
+run_script "$root/test-uses-fb-backend-by-default.sh" || rc=1
+run_script "$root/test-uses-fb-backend-if-selected-via-config.sh" || rc=1
+run_script "$root/test-uses-drm-backend-if-selected-via-config-and-available.sh" || rc=1
+
+exit $rc

test/test-without-drm.sh

@@ -4,8 +4,12 @@ root=$(dirname "${BASH_SOURCE[0]}")
 
 source "$root/helpers.sh"
 
-run_script "$root/build-without-drm.sh"
-run_script "$root/test-version-matches-meson-and-changelog.sh"
-run_script "$root/test-uses-fb-backend-by-default.sh"
-run_script "$root/test-uses-fb-backend-if-selected-via-config.sh"
-run_script "$root/test-uses-fb-backend-if-drm-selected-via-config-but-unavailable.sh"
+rc=0
+
+run_script "$root/build-without-drm.sh" || rc=1
+run_script "$root/test-version-matches-meson-and-changelog.sh" || rc=1
+run_script "$root/test-uses-fb-backend-by-default.sh" || rc=1
+run_script "$root/test-uses-fb-backend-if-selected-via-config.sh" || rc=1
+run_script "$root/test-uses-fb-backend-if-drm-selected-via-config-but-unavailable.sh" || rc=1
+
+exit $rc