Auto-detect CI/TUI mode for non-interactive environments and improve patch application robustness
- apply-patches.sh: add signature-marker checks for build-system patches to handle cases where reverse-check fails but patch is already applied - test-baremetal.sh: auto-disable TUI when stdout is not a terminal; pass CI=1 to make - test-live-iso-qemu.sh: pass CI=1 via env to prevent repo cook panic - scripts/run.sh: auto-disable TUI when stdout is not a terminal; pass CI=1 to qemu launch - repo.rs: improve TUI initialization error messages (raw mode + alternate screen) and rustfmt cleanups - config.rs: auto-detect TTY presence for TUI enablement; use is_terminal() instead of relying solely on CI env var
This commit is contained in:
Executable
+110
@@ -0,0 +1,110 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||
|
||||
ALLOW_UPSTREAM=0
|
||||
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage: $(basename "$0") [OPTIONS]
|
||||
|
||||
Build ALL Red Bear OS live ISOs for real bare metal.
|
||||
|
||||
Targets built in order:
|
||||
1. redbear-full — Full desktop ISO (Wayland + KDE + GPU drivers)
|
||||
2. redbear-mini — Text-only ISO
|
||||
3. redbear-grub — Text-only ISO with GRUB boot manager
|
||||
|
||||
Options:
|
||||
--upstream Allow Redox/upstream recipe source refresh during build
|
||||
-h, --help Show this help
|
||||
|
||||
Environment:
|
||||
CI=1 Force non-interactive mode (no TUI)
|
||||
MAKEFLAGS Passed through to make
|
||||
EOF
|
||||
exit 0
|
||||
}
|
||||
|
||||
while [ $# -gt 0 ]; do
|
||||
case "$1" in
|
||||
--upstream)
|
||||
ALLOW_UPSTREAM=1
|
||||
;;
|
||||
-h|--help)
|
||||
usage
|
||||
;;
|
||||
-*)
|
||||
echo "Unknown option: $1" >&2
|
||||
usage >&2
|
||||
exit 1
|
||||
;;
|
||||
*)
|
||||
echo "Unknown argument: $1" >&2
|
||||
usage >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
cd "$PROJECT_ROOT"
|
||||
|
||||
# Auto-disable TUI when stdout is not a terminal (prevents repo cook panic)
|
||||
if [ -z "${CI:-}" ] && { [ ! -t 0 ] || [ ! -t 1 ]; }; then
|
||||
export CI=1
|
||||
fi
|
||||
|
||||
TARGETS=("redbear-full" "redbear-mini" "redbear-grub")
|
||||
ARCH="x86_64"
|
||||
FAILED=()
|
||||
|
||||
for CONFIG_NAME in "${TARGETS[@]}"; do
|
||||
echo ""
|
||||
echo "======================================================================"
|
||||
echo " Building ISO: $CONFIG_NAME"
|
||||
echo "======================================================================"
|
||||
echo ""
|
||||
|
||||
if [ "$ALLOW_UPSTREAM" -eq 1 ]; then
|
||||
if ! bash "$SCRIPT_DIR/build-iso.sh" --upstream "$CONFIG_NAME" "$ARCH"; then
|
||||
FAILED+=("$CONFIG_NAME")
|
||||
echo ""
|
||||
echo "WARNING: Build failed for $CONFIG_NAME — continuing with next target..."
|
||||
echo ""
|
||||
fi
|
||||
else
|
||||
if ! bash "$SCRIPT_DIR/build-iso.sh" "$CONFIG_NAME" "$ARCH"; then
|
||||
FAILED+=("$CONFIG_NAME")
|
||||
echo ""
|
||||
echo "WARNING: Build failed for $CONFIG_NAME — continuing with next target..."
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
echo ""
|
||||
echo "======================================================================"
|
||||
echo " Build Summary"
|
||||
echo "======================================================================"
|
||||
echo ""
|
||||
|
||||
for CONFIG_NAME in "${TARGETS[@]}"; do
|
||||
ISO_PATH="build/$ARCH/$CONFIG_NAME.iso"
|
||||
if [ -f "$ISO_PATH" ]; then
|
||||
echo " [OK] $CONFIG_NAME → $ISO_PATH"
|
||||
else
|
||||
echo " [MISSING] $CONFIG_NAME"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ ${#FAILED[@]} -gt 0 ]; then
|
||||
echo ""
|
||||
echo "FAILED targets: ${FAILED[*]}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "All ISOs built successfully."
|
||||
+6
-1
@@ -52,6 +52,11 @@ done
|
||||
|
||||
cd "$PROJECT_ROOT"
|
||||
|
||||
# Auto-disable TUI when stdout is not a terminal (prevents repo cook panic)
|
||||
if [ -z "${CI:-}" ] && { [ ! -t 0 ] || [ ! -t 1 ]; }; then
|
||||
export CI=1
|
||||
fi
|
||||
|
||||
if [ "$BUILD" -eq 1 ]; then
|
||||
echo "==> Ensuring .config is set for native build..."
|
||||
if ! grep -q 'PODMAN_BUILD?=0' .config 2>/dev/null; then
|
||||
@@ -91,4 +96,4 @@ fi
|
||||
echo "==> Launching Red Bear OS in QEMU ($CONFIG_NAME, $ARCH)..."
|
||||
echo ""
|
||||
|
||||
exec make qemu "CONFIG_NAME=$CONFIG_NAME" ARCH="$ARCH" "${QEMU_EXTRA_ARGS[@]}"
|
||||
exec make qemu "CONFIG_NAME=$CONFIG_NAME" ARCH="$ARCH" CI=1 "${QEMU_EXTRA_ARGS[@]}"
|
||||
|
||||
Reference in New Issue
Block a user