Fail if base image cannot be built

dgud · Jan 15, 2024 · 1651a0a · 1651a0a
1 parent a66bde2
commit 1651a0a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/actions/build-base-image/action.yaml b/.github/actions/build-base-image/action.yaml
@@ -16,7 +16,7 @@ runs:
     using: composite
     steps:
       - name: Cleanup GH Runner
-        shell: bash -euxo pipefail {0}
+        shell: bash -euo pipefail {0}
         run: |
             ## Delete large files from runner to get more disk space
             ## See https://github.com/actions/runner-images/issues/2840
@@ -57,7 +57,7 @@ runs:
             key: prebuilt-cache-${{ inputs.TYPE }}-${{ github.ref_name }}-${{ github.sha }}
       - name: Build image
         if: inputs.BUILD_IMAGE == 'true'
-        shell: bash -euxo pipefail {0}
+        shell: bash -eo pipefail {0}
         run: |
           .github/scripts/restore-from-prebuilt.sh `pwd` .github/otp.tar.gz
           rm -f otp_{src,cache}.tar.gz

diff --git a/.github/scripts/build-base-image.sh b/.github/scripts/build-base-image.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eo pipefail
+
 BASE_BRANCH="$1"
 
 case "${BASE_BRANCH}" in