From 9971580bb8cc4e3f5a54865014a99434e6e52381 Mon Sep 17 00:00:00 2001 From: "prompt.ac/@jeffrey" Date: Sat, 18 Apr 2026 14:25:50 -0700 Subject: [PATCH] fedac/native/scripts/upload-release.sh: fall back to in-repo upload.env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The oven's clone doesn't have aesthetic-computer-vault as a sibling, so the vault-path lookup silently failed there — the script then fell through to GPG decrypt (no keyring on the oven) and aborted with "DO_SPACES_KEY not set", bricking Phase 4 of the OTA build. Also checks SCRIPT_DIR/../upload.env (the in-tree credentials file that ships with fedac/native) as a second source. Local devs still prefer the vault file; oven + CI pick up the in-tree one. Co-Authored-By: Claude Opus 4.7 (1M context) --- fedac/native/scripts/upload-release.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fedac/native/scripts/upload-release.sh b/fedac/native/scripts/upload-release.sh index 4fffc9afd..a6b1389b8 100755 --- a/fedac/native/scripts/upload-release.sh +++ b/fedac/native/scripts/upload-release.sh @@ -32,9 +32,14 @@ if [ -z "${DO_SPACES_KEY:-}" ] || [ -z "${DO_SPACES_SECRET:-}" ]; then [ -f "/tmp/.ac-upload-env" ] && { set -a; source "/tmp/.ac-upload-env"; set +a; } fi if [ -z "${DO_SPACES_KEY:-}" ] || [ -z "${DO_SPACES_SECRET:-}" ]; then - # Plaintext vault file - VAULT_ENV="${SCRIPT_DIR}/../../../aesthetic-computer-vault/fedac/native/upload.env" - [ -f "$VAULT_ENV" ] && { set -a; source "$VAULT_ENV"; set +a; } + # Plaintext vault file, or in-repo fallback (oven ships upload.env in-tree). + # The oven's clone has no aesthetic-computer-vault/ sibling, so without + # this fallback the upload silently failed with "DO_SPACES_KEY not set". + for candidate in \ + "${SCRIPT_DIR}/../../../aesthetic-computer-vault/fedac/native/upload.env" \ + "${SCRIPT_DIR}/../upload.env"; do + [ -f "$candidate" ] && { set -a; source "$candidate"; set +a; break; } + done fi if [ -z "${DO_SPACES_KEY:-}" ] || [ -z "${DO_SPACES_SECRET:-}" ]; then # GPG decrypt from vault -- 2.51.2