diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml index 3459a45..b9f9683 100644 --- a/.gitea/workflows/base-build.yml +++ b/.gitea/workflows/base-build.yml @@ -44,24 +44,27 @@ jobs: bash base-image-script/debian-${version}_pt1.sh RAW_ARCHIVE="./debian-${version}.tar.bz2" + ALTERNATE_ARCHIVE="./output/debian-${version}.tar.bz2" FINAL_ARCHIVE="${version}/rootfs-${version}.tar.bz2" - if [[ ! -f "$RAW_ARCHIVE" ]]; then - mkdir -p "$(dirname "$FINAL_ARCHIVE")" - RAW_ARCHIVE="./output/debian-${version}.tar.bz2" - echo "[INFO] Moved archive to $FINAL_ARCHIVE" + if [[ -f "$RAW_ARCHIVE" ]]; then + echo "[INFO] Found archive at $RAW_ARCHIVE" + elif [[ -f "$ALTERNATE_ARCHIVE" ]]; then + RAW_ARCHIVE="$ALTERNATE_ARCHIVE" + echo "[INFO] Found archive at alternate location $RAW_ARCHIVE" else - echo "[ERROR] Archive for $version not found: $RAW_ARCHIVE" + echo "[ERROR] Archive for $version not found in expected locations:" + echo " - $RAW_ARCHIVE" + echo " - $ALTERNATE_ARCHIVE" exit 1 fi - if [[ -f "$RAW_ARCHIVE" ]]; then - mkdir -p "$(dirname "$FINAL_ARCHIVE")" - mv "$RAW_ARCHIVE" "$FINAL_ARCHIVE" + mkdir -p "$(dirname "$FINAL_ARCHIVE")" + mv "$RAW_ARCHIVE" "$FINAL_ARCHIVE" - CHECKSUM=$(sha256sum "$FINAL_ARCHIVE" | awk '{print $1}') - echo "[INFO] SHA256 for $FINAL_ARCHIVE: $CHECKSUM" - echo "$CHECKSUM $FINAL_ARCHIVE" >> sha256sums.txt + CHECKSUM=$(sha256sum "$FINAL_ARCHIVE" | awk '{print $1}') + echo "[INFO] SHA256 for $FINAL_ARCHIVE: $CHECKSUM" + echo "$CHECKSUM $FINAL_ARCHIVE" >> sha256sums.txt else echo "[ERROR] Archive for $version not found: $RAW_ARCHIVE" exit 1