diff options
| author | Danilo M. <danix@danix.xyz> | 2026-07-13 12:35:47 +0200 |
|---|---|---|
| committer | Danilo M. <danix@danix.xyz> | 2026-07-13 12:35:47 +0200 |
| commit | 26674aad828040c8cd95783f0e0987e9b738fa6a (patch) | |
| tree | f0fd2211551a2841a2388afa5796b22690048189 | |
| parent | 0b4233328232e73256c8090916ce9954ac30a165 (diff) | |
| download | sbo-slackbuilds-26674aad828040c8cd95783f0e0987e9b738fa6a.tar.gz sbo-slackbuilds-26674aad828040c8cd95783f0e0987e9b738fa6a.zip | |
image-builder: per-variant isolation, non-zero exit on failure
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
| -rw-r--r-- | .extras/image-builder/bootstrap.sh | 7 | ||||
| -rw-r--r-- | .extras/image-builder/build-full-image.sh | 7 | ||||
| -rw-r--r-- | .extras/image-builder/build-sbo-testbuild.sh | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/.extras/image-builder/bootstrap.sh b/.extras/image-builder/bootstrap.sh index 99766fe..63b5c17 100644 --- a/.extras/image-builder/bootstrap.sh +++ b/.extras/image-builder/bootstrap.sh @@ -518,8 +518,13 @@ DOCKERFILE # Main # ============================================================================ +rc=0 for VERSION in "${BUILD_VARIANTS[@]}"; do if changelog_changed "${VERSION}"; then - build_variant "${VERSION}" + if ! ( build_variant "${VERSION}" ); then + _warn "variant ${VERSION} failed; continuing." + rc=1 + fi fi done +exit "${rc}" diff --git a/.extras/image-builder/build-full-image.sh b/.extras/image-builder/build-full-image.sh index 22db536..8c4476e 100644 --- a/.extras/image-builder/build-full-image.sh +++ b/.extras/image-builder/build-full-image.sh @@ -179,6 +179,11 @@ DOCKERFILE # Main # ============================================================================ +rc=0 for VERSION in "${BUILD_VARIANTS[@]}"; do - build_variant "${VERSION}" + if ! ( build_variant "${VERSION}" ); then + _warn "variant ${VERSION} failed; continuing." + rc=1 + fi done +exit "${rc}" diff --git a/.extras/image-builder/build-sbo-testbuild.sh b/.extras/image-builder/build-sbo-testbuild.sh index 07319a4..e71e146 100644 --- a/.extras/image-builder/build-sbo-testbuild.sh +++ b/.extras/image-builder/build-sbo-testbuild.sh @@ -112,6 +112,11 @@ DOCKERFILE } require_pkgs +rc=0 for VERSION in "${BUILD_VARIANTS[@]}"; do - build_variant "${VERSION}" + if ! ( build_variant "${VERSION}" ); then + _warn "variant ${VERSION} failed; continuing." + rc=1 + fi done +exit "${rc}" |