Merge pull request 'fix: dev/phase-handler.sh still has divergent infra heuristics (#427)' (#508) from fix/issue-427 into main

This commit is contained in:
johba 2026-03-21 17:59:02 +01:00
commit 89a9a822de

View file

@ -26,6 +26,10 @@
# shellcheck source=../lib/secret-scan.sh # shellcheck source=../lib/secret-scan.sh
source "$(dirname "${BASH_SOURCE[0]}")/../lib/secret-scan.sh" source "$(dirname "${BASH_SOURCE[0]}")/../lib/secret-scan.sh"
# Load shared CI helpers (is_infra_step, classify_pipeline_failure, etc.)
# shellcheck source=../lib/ci-helpers.sh
source "$(dirname "${BASH_SOURCE[0]}")/../lib/ci-helpers.sh"
# --- Default globals (agents can override after sourcing) --- # --- Default globals (agents can override after sourcing) ---
: "${CI_POLL_TIMEOUT:=1800}" : "${CI_POLL_TIMEOUT:=1800}"
: "${REVIEW_POLL_TIMEOUT:=10800}" : "${REVIEW_POLL_TIMEOUT:=10800}"
@ -371,8 +375,9 @@ Write PHASE:awaiting_review to the phase file, then stop and wait for review fee
log "CI failed: step=${FAILED_STEP:-unknown} exit=${FAILED_EXIT:-?}" log "CI failed: step=${FAILED_STEP:-unknown} exit=${FAILED_EXIT:-?}"
case "${FAILED_STEP}" in git*) IS_INFRA=true ;; esac if [ -n "$FAILED_STEP" ] && is_infra_step "$FAILED_STEP" "${FAILED_EXIT:-0}" >/dev/null 2>&1; then
case "${FAILED_EXIT}" in 128|137) IS_INFRA=true ;; esac IS_INFRA=true
fi
if [ "$IS_INFRA" = true ] && [ "${CI_RETRY_COUNT:-0}" -lt 1 ]; then if [ "$IS_INFRA" = true ] && [ "${CI_RETRY_COUNT:-0}" -lt 1 ]; then
CI_RETRY_COUNT=$(( CI_RETRY_COUNT + 1 )) CI_RETRY_COUNT=$(( CI_RETRY_COUNT + 1 ))