golem15/summercms
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(19.7): RA-IN-06 demo_pins refuses a failing pin check with no mismatch line

Browse Source 
demo_pins counts the mismatch lines it accepts and refuses when
check-pins.sh exits non-zero without one, instead of passing on the single
empty line of an empty output. The self-test plants a silent failing
check-pins.sh (pins-silent-failure).
This commit is contained in:
Jakub Zych
2026-10-23 20:16:32 +02:00
parent 2fdda99c08
commit 99f5ed4dfb
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/check-phase19.7.sh
View File

@@ -808,6 +808,8 @@ run_self_test() {
git -C "$canon" checkout -q - git -C "$canon" checkout -q -
expect_mode pins-released-unreleased 1 "refuse: PHASE197_RELEASED=1" --demo-pins "DEMO_APP=$demo" "USER_PLUGIN=$canon" PHASE197_RELEASED=1 expect_mode pins-released-unreleased 1 "refuse: PHASE197_RELEASED=1" --demo-pins "DEMO_APP=$demo" "USER_PLUGIN=$canon" PHASE197_RELEASED=1
unset -f planted_pins unset -f planted_pins
printf '#!/usr/bin/env bash\nexit 1\n' >"$demo/scripts/check-pins.sh"
expect_mode pins-silent-failure 1 "without a mismatch line" --demo-pins "DEMO_APP=$demo" "USER_PLUGIN=$canon" PHASE197_RELEASED=0
rm -rf "$demo" rm -rf "$demo"
# The final verdict: unqualified only without unreleased drift. # The final verdict: unqualified only without unreleased drift.
@@ -1013,7 +1015,7 @@ canonical_checkout() {
# plugin's canonical checkout (reported as unreleased commits, released # plugin's canonical checkout (reported as unreleased commits, released
# after verification); any other mismatch fails. # after verification); any other mismatch fails.
demo_pins() { demo_pins() {
local out rc=0 line name want head full changed canonical local out rc=0 line name want head full changed canonical accepted=0
[[ -f "$DEMO_APP/scripts/check-pins.sh" ]] || { [[ -f "$DEMO_APP/scripts/check-pins.sh" ]] || {
echo "refuse: $DEMO_APP/scripts/check-pins.sh not found" >&2 echo "refuse: $DEMO_APP/scripts/check-pins.sh not found" >&2
return 1 return 1
@@ -1041,6 +1043,7 @@ demo_pins() {
changed="$(git -C "$DEMO_APP/$name" diff --name-only "$want" HEAD | grep -vE '_test\.go$' || true)" changed="$(git -C "$DEMO_APP/$name" diff --name-only "$want" HEAD | grep -vE '_test\.go$' || true)"
if [[ -z "$changed" ]]; then if [[ -z "$changed" ]]; then
echo "pins: $name is ahead of its pin $want by test-only commits (release not needed for shipped code)" echo "pins: $name is ahead of its pin $want by test-only commits (release not needed for shipped code)"
accepted=$((accepted + 1))
continue continue
fi fi
canonical="$(canonical_checkout "$name")" canonical="$(canonical_checkout "$name")"
@@ -1051,6 +1054,7 @@ demo_pins() {
if [[ -n "${PHASE197_PINS_FILE:-}" ]]; then if [[ -n "${PHASE197_PINS_FILE:-}" ]]; then
printf '%s\n' "$name" >>"$PHASE197_PINS_FILE" printf '%s\n' "$name" >>"$PHASE197_PINS_FILE"
fi fi
accepted=$((accepted + 1))
continue continue
fi fi
printf '%s\n' "$changed" >&2 printf '%s\n' "$changed" >&2
@@ -1061,6 +1065,11 @@ demo_pins() {
echo "refuse: the demo's pin check failed" >&2 echo "refuse: the demo's pin check failed" >&2
return 1 return 1
done <<<"$out" done <<<"$out"
# A failing check-pins.sh that printed no mismatch line never passes.
if [[ "$accepted" -eq 0 ]]; then
echo "refuse: the demo's pin check failed (exit $rc) without a mismatch line" >&2
return 1
fi
} }
docker_up() { docker_up() {