diff --git a/.woodpecker/agent-smoke.sh b/.woodpecker/agent-smoke.sh index 0d2a016..80b6160 100644 --- a/.woodpecker/agent-smoke.sh +++ b/.woodpecker/agent-smoke.sh @@ -21,9 +21,12 @@ FAILED=0 # Uses awk instead of grep -Eo for busybox/Alpine compatibility (#296). get_fns() { local f="$1" - awk '/^[ \t]*[a-zA-Z_][a-zA-Z0-9_]+[ \t]*\(\)/ { - sub(/^[ \t]+/, "") - sub(/[ \t]*\(\).*/, "") + # Use POSIX character classes and bracket-escaped parens for BusyBox awk + # compatibility (BusyBox awk does not expand \t to tab in character classes + # and may handle \( differently in ERE patterns). + awk '/^[[:space:]]*[a-zA-Z_][a-zA-Z0-9_]+[[:space:]]*[(][)]/ { + sub(/^[[:space:]]+/, "") + sub(/[[:space:]]*[(][)].*/, "") print }' "$f" 2>/dev/null | sort -u || true } @@ -64,9 +67,10 @@ get_candidates() { if (match(p, /^[a-z][a-zA-Z0-9_]*_[a-zA-Z0-9_]+/)) { word = substr(p, RSTART, RLENGTH) rest = substr(p, RSTART + RLENGTH, 1) - # Skip: case labels (word) or word|), Python/jq patterns (word:), - # object method calls (word.method), assignments (word=) - if (rest == ")" || rest == "|" || rest == ":" || rest == "." || rest == "=") continue + # Skip: function definitions (word(), case labels (word) or word|), + # Python/jq patterns (word:), object method calls (word.method), + # assignments (word=) + if (rest == "(" || rest == ")" || rest == "|" || rest == ":" || rest == "." || rest == "=") continue print word } } diff --git a/bin/disinto b/bin/disinto index e1c5107..5fa230d 100755 --- a/bin/disinto +++ b/bin/disinto @@ -861,19 +861,30 @@ push_to_forge() { return 1 fi - # Verify the repo is no longer empty - local repo_info - repo_info=$(curl -sf --max-time 10 \ - -H "Authorization: token ${FORGE_TOKEN}" \ - "${forge_url}/api/v1/repos/${repo_slug}" 2>/dev/null) || repo_info="" - if [ -n "$repo_info" ]; then - local is_empty - is_empty=$(printf '%s' "$repo_info" | jq -r '.empty // "unknown"') - if [ "$is_empty" = "true" ]; then - echo "Warning: Forgejo repo still reports empty after push" >&2 - return 1 + # Verify the repo is no longer empty (Forgejo may need a moment to index pushed refs) + local is_empty="true" + local verify_attempt + for verify_attempt in $(seq 1 5); do + local repo_info + repo_info=$(curl -sf --max-time 10 \ + -H "Authorization: token ${FORGE_TOKEN}" \ + "${forge_url}/api/v1/repos/${repo_slug}" 2>/dev/null) || repo_info="" + if [ -z "$repo_info" ]; then + is_empty="skipped" + break # API unreachable, skip verification fi - echo "Verify: repo is not empty (push confirmed)" + is_empty=$(printf '%s' "$repo_info" | jq -r '.empty // "unknown"') + if [ "$is_empty" != "true" ]; then + echo "Verify: repo is not empty (push confirmed)" + break + fi + if [ "$verify_attempt" -lt 5 ]; then + sleep 2 + fi + done + if [ "$is_empty" = "true" ]; then + echo "Warning: Forgejo repo still reports empty after push" >&2 + return 1 fi }