Skip to content

Commit 7e0da8f

Browse files
sleidigclaude
andcommitted
fix(docker-image): avoid A && B || C for the shellcheck version on the runners
Part of Aam-Digital/internal#392 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 749a528 commit 7e0da8f

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

‎.github/workflows/docker-image.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,9 @@ jobs:
456456
'NR == FNR { if ($1 == image && $3 != new) moved[$3] = moved[$3] "," $2 ","; next }
457457
($2 in moved) { n = split($3, t, ","); for (i = 1; i <= n; i++) if (index(moved[$2], "," t[i] ",")) { print $2; exit } }' \
458458
"$record" "$work/versions")
459-
[ -n "$stale" ] && [ "$attempt" -lt 3 ] || break
459+
if [ -z "$stale" ] || [ "$attempt" -ge 3 ]; then
460+
break
461+
fi
460462
echo "$image: the package listing does not show the new tags yet, retrying in 10 seconds"
461463
sleep 10
462464
done
@@ -470,7 +472,9 @@ jobs:
470472
safe=true
471473
if [ -n "$oldest" ]; then
472474
while IFS=$'\t' read -r id digest tags; do
473-
[ -n "$tags" ] && [ "$id" -ge "$oldest" ] || continue
475+
if [ -z "$tags" ] || [ "$id" -lt "$oldest" ]; then
476+
continue
477+
fi
474478
echo "$digest" >> "$work/referenced"
475479
if grep -qxF "$digest" "$work/candidates"; then
476480
awk -v d="$digest" '$1 == d { print $2 }' "$work/children" >> "$work/referenced"

0 commit comments

Comments
 (0)