File 0954-Fail-if-base-image-cannot-be-built.patch of Package erlang
From 1651a0aea3a9d413c4755e5487920b69174c1a9a Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Wed, 10 Jan 2024 13:48:38 +0100
Subject: [PATCH] Fail if base image cannot be built
---
.github/actions/build-base-image/action.yaml | 4 ++--
.github/scripts/build-base-image.sh | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/actions/build-base-image/action.yaml b/.github/actions/build-base-image/action.yaml
index a3f0b290b1..88de25a87b 100644
--- 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
@@ -53,7 +53,7 @@ runs:
key: prebuilt-${{ 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
index 5836efc30b..da092a6d06 100755
--- 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
--
2.35.3