Stop building when an step fails

StellaSmith · Mar 23, 2022 · 7efd232 · 7efd232
1 parent 212c03e
commit 7efd232
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -50,20 +50,21 @@ jobs:
 
     - name: Configure & Build Tools
       run: |
+        set -e
         export PATH="/usr/lib/ccache/bin:/usr/local/opt/ccache/libexec:$PATH"
         cmake -S tools/ -B build/tools-build/ -DCMAKE_BUILD_TYPE=Release
         cmake --build build/tools-build/ --parallel
-        cmake --install build/tools-build/ --prefix build/tools-install/
+        exec cmake --install build/tools-build/ --prefix build/tools-install/
 
     - name: Configure
       env:
         CC: ${{ matrix.compiler.c }}
         CXX: ${{ matrix.compiler.cxx }}
       run: |
         export PATH="/usr/lib/ccache/bin:/usr/local/opt/ccache/libexec:build/tools-install/bin:$PATH"
-        cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        exec cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
 
     - name: Build
       run: |
         export PATH="/usr/lib/ccache/bin:/usr/local/opt/ccache/libexec:build/tools-install/bin:$PATH"
-        cmake --build build --parallel
+        exec cmake --build build --parallel
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -55,10 +55,11 @@ jobs:
 
     - name: Configure & Build Tools
       run: |
+        set -e
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
         cmake -S tools/ -B build/tools-build/ -DCMAKE_BUILD_TYPE=Release
         cmake --build build/tools-build/ --parallel
-        cmake --install build/tools-build/ --prefix build/tools-install/
+        exec cmake --install build/tools-build/ --prefix build/tools-install/
 
     - name: Configure
       env:
@@ -80,7 +81,7 @@ jobs:
         CXXFLAGS: ${{ matrix.target_host.cxxflags }}
       run: |
         export PATH="/usr/lib/ccache/bin:/usr/local/opt/ccache/libexec:build/tools-install/bin:$PATH"
-        cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.target_host.arch }} -DCMAKE_FIND_ROOT_PATH=/usr/${{ matrix.target_host.toolchain }} -DCMAKE_SYSROOT=/usr/${{ matrix.target_host.toolchain }}
+        exec cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.target_host.arch }} -DCMAKE_FIND_ROOT_PATH=/usr/${{ matrix.target_host.toolchain }} -DCMAKE_SYSROOT=/usr/${{ matrix.target_host.toolchain }}
     
     - name: Build
       run: cmake --build build --parallel
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
@@ -50,9 +50,10 @@ jobs:
 
     - name: Configure & Build Tools
       run: |
+        set -e
         cmake -S tools/ -B build/tools-build/ -DCMAKE_BUILD_TYPE=Release
         cmake --build build/tools-build/ --parallel
-        cmake --install build/tools-build/ --prefix build/tools-install/
+        exec cmake --install build/tools-build/ --prefix build/tools-install/
 
     - name: Configure
       env:
@@ -63,7 +64,7 @@ jobs:
         CXXFLAGS: -Wa,-mbig-obj
       run: |
         export PATH="build/tools-install/bin:$PATH"
-        cmake -S ./ -B build/ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        exec cmake -S ./ -B build/ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
 
     - name: Build
       run: cmake --build build --parallel
diff --git a/tools/build_mingw.sh b/tools/build_mingw.sh
@@ -5,6 +5,8 @@
 # Build tools
 ###
 
+set -e
+
 cmake -S tools/ -B build/tools-build/ -DCMAKE_BUILD_TYPE=Release
 cmake --build build/tools-build/ --parallel
 cmake --install build/tools-build/ --prefix build/tools-install/

diff --git a/tools/build_unix.sh b/tools/build_unix.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
+set -e
+
 cmake -S tools/ -B build/tools-build/ -DCMAKE_BUILD_TYPE=Release
 cmake --build build/tools-build/ --parallel
 cmake --install build/tools-build/ --prefix build/tools-install/
 
 export PATH=build/tools-install/bin:$PATH
 
 cmake -S ./ -B build/ -DCMAKE_BUILD_TYPE=Release
-cmake --build build/ --parallel
-cmake --install build/ --prefix install/
+exec cmake --build build/ --parallel