* test(#4784): failing-first — Xcode gates must pass -project and derive the destination from available simulators * fix(#4784): Xcode gates pass -project '$XCODEPROJ' and resolve the destination from available simulators, skipping loudly when none exist Also surfaces the -collect-test-diagnostics never / workflow.test_gate_timeout guidance on a 124 timeout (a real iOS suite measured ~600s of sysdiagnose collection after the tests passed). * test(#4784): reachability-honest test shapes — apostrophe-confused prose (the path the false positive actually reaches past the splitter) and the file's single-quote convention * fix(#4784): review fold-ins — unanchor the simulator extraction (real simctl lines end in a state suffix), escape apostrophes for the bash -c layer, assign the command variables on the skip path, behavioral extraction test The isolated reviewer's Finding 1 was critical: the first cut's $-anchored sed matched ZERO real simctl lines (every device line ends in (Shutdown)/(Booted)), so the gates would have skipped on every machine. The 46,454-test green could not see it (content assertions do not execute the pipeline); the new behavioral test runs the gate's own extraction against a real-format line. * chore(#4784): backfill changeset PR number (4879) --------- Co-authored-by: sim <sim@local>
This commit is contained in:
@@ -16,10 +16,33 @@ if [ -z "$BUILD_CMD" ]; then
|
||||
if [ -n "$XCODEPROJ" ]; then
|
||||
# Xcode project: get first scheme from xcodebuild -list -json
|
||||
XCODE_SCHEME=$(xcodebuild -list -json -project "$XCODEPROJ" 2>/dev/null | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('project',{}).get('schemes',[None])[0] or '')" 2>/dev/null || true)
|
||||
if [ -n "$XCODE_SCHEME" ]; then
|
||||
BUILD_CMD="xcodebuild build -scheme '$XCODE_SCHEME' -destination 'platform=iOS Simulator,name=iPhone 16'"
|
||||
# #4784: a concrete simulator NAME is machine state, not project state — the
|
||||
# hardcoded 'iPhone 16' can never match on machines whose simulators were
|
||||
# never created. Resolve the first available iOS simulator (id= works for
|
||||
# both build and test); with none available, skip the Xcode gates loudly
|
||||
# instead of running commands that are guaranteed to fail. The sed takes the
|
||||
# LAST ≥8-char hex/dash parenthetical WITHOUT a $ anchor: real simctl lines
|
||||
# end in a (Shutdown)/(Booted) state suffix (often with trailing space), and
|
||||
# the state word is never in the hex class, so the UDID is always the last
|
||||
# in-class group even when the device name carries its own parentheses.
|
||||
XCODE_SIM=$(xcrun simctl list devices available 2>/dev/null | sed -n 's/.*(\([A-F0-9-]\{8,\}\)).*/\1/p' | head -1)
|
||||
if [ -z "$XCODE_SIM" ]; then
|
||||
echo "⚠ No available iOS Simulator found — skipping the Xcode build gate. Set workflow.build_command to run it anyway."
|
||||
BUILD_CMD=""
|
||||
XCODEPROJ=""
|
||||
else
|
||||
BUILD_CMD="xcodebuild build -destination 'platform=iOS Simulator,name=iPhone 16'"
|
||||
XCODE_DEST="id=$XCODE_SIM"
|
||||
# #4784 review F2: the command string is re-parsed by `bash -c`, so an
|
||||
# apostrophe in a repo/scheme name would terminate the quote (unbalanced-
|
||||
# quote failure; a crafted path shape reaches command injection). Escape
|
||||
# for the single-quoted span at the only boundary GSD owns.
|
||||
XCODEPROJ=$(printf '%s' "$XCODEPROJ" | sed "s/'/'\\\\''/g")
|
||||
XCODE_SCHEME=$(printf '%s' "$XCODE_SCHEME" | sed "s/'/'\\\\''/g")
|
||||
fi
|
||||
if [ -n "$XCODEPROJ" ] && [ -n "$XCODE_SCHEME" ]; then
|
||||
BUILD_CMD="xcodebuild build -project '$XCODEPROJ' -scheme '$XCODE_SCHEME' -destination '${XCODE_DEST}'"
|
||||
elif [ -n "$XCODEPROJ" ]; then
|
||||
BUILD_CMD="xcodebuild build -project '$XCODEPROJ' -destination '${XCODE_DEST}'"
|
||||
fi
|
||||
elif [ -f "Makefile" ] && grep -q "^build:" Makefile; then
|
||||
BUILD_CMD="make build"
|
||||
@@ -68,14 +91,28 @@ TEST_CMD=$(gsd_run query config-get workflow.test_command --default "" --raw 2>/
|
||||
if [ -z "$TEST_CMD" ]; then
|
||||
XCODEPROJ=$(find . -maxdepth 2 -name "*.xcodeproj" -not -path "*/node_modules/*" 2>/dev/null | head -1)
|
||||
if [ -n "$XCODEPROJ" ]; then
|
||||
# Xcode project: reuse scheme detected above (or re-detect)
|
||||
# Xcode project: reuse scheme + simulator resolved above (or re-detect)
|
||||
if [ -z "${XCODE_SCHEME:-}" ]; then
|
||||
XCODE_SCHEME=$(xcodebuild -list -json -project "$XCODEPROJ" 2>/dev/null | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('project',{}).get('schemes',[None])[0] or '')" 2>/dev/null || true)
|
||||
fi
|
||||
if [ -n "$XCODE_SCHEME" ]; then
|
||||
TEST_CMD="xcodebuild test -scheme '$XCODE_SCHEME' -destination 'platform=iOS Simulator,name=iPhone 16'"
|
||||
# #4784: reuse the simulator resolved by the build gate; re-detect if this
|
||||
# block runs in a fresh shell. No simulator → skip loudly, same as Step A.
|
||||
if [ -z "${XCODE_SIM:-}" ]; then
|
||||
XCODE_SIM=$(xcrun simctl list devices available 2>/dev/null | sed -n 's/.*(\([A-F0-9-]\{8,\}\)).*/\1/p' | head -1)
|
||||
fi
|
||||
if [ -z "$XCODE_SIM" ]; then
|
||||
echo "⚠ No available iOS Simulator found — skipping the Xcode test gate. Set workflow.test_command to run it anyway."
|
||||
TEST_CMD=""
|
||||
XCODEPROJ=""
|
||||
else
|
||||
TEST_CMD="xcodebuild test -destination 'platform=iOS Simulator,name=iPhone 16'"
|
||||
XCODE_DEST="id=$XCODE_SIM"
|
||||
XCODEPROJ=$(printf '%s' "$XCODEPROJ" | sed "s/'/'\\\\''/g")
|
||||
XCODE_SCHEME=$(printf '%s' "$XCODE_SCHEME" | sed "s/'/'\\\\''/g")
|
||||
fi
|
||||
if [ -n "$XCODEPROJ" ] && [ -n "$XCODE_SCHEME" ]; then
|
||||
TEST_CMD="xcodebuild test -project '$XCODEPROJ' -scheme '$XCODE_SCHEME' -destination '${XCODE_DEST}'"
|
||||
elif [ -n "$XCODEPROJ" ]; then
|
||||
TEST_CMD="xcodebuild test -project '$XCODEPROJ' -destination '${XCODE_DEST}'"
|
||||
fi
|
||||
elif [ -f "Makefile" ] && grep -q "^test:" Makefile; then
|
||||
TEST_CMD="make test"
|
||||
@@ -105,7 +142,7 @@ TEST_EXIT=$?
|
||||
if [ "${TEST_EXIT}" -eq 0 ]; then
|
||||
echo "✓ Post-merge test gate passed — no cross-plan conflicts"
|
||||
elif [ "${TEST_EXIT}" -eq 124 ]; then
|
||||
echo "⚠ POST-MERGE TEST GATE TIMED OUT after ${TEST_GATE_TIMEOUT}s — the runner did not exit, likely stuck in watch/dev mode (e.g. vitest without 'run'). Verify tests with a one-shot command (e.g. 'vitest run') or raise workflow.test_gate_timeout."
|
||||
echo "⚠ POST-MERGE TEST GATE TIMED OUT after ${TEST_GATE_TIMEOUT}s — the runner did not exit, likely stuck in watch/dev mode (e.g. vitest without 'run'). Verify tests with a one-shot command (e.g. 'vitest run') or raise workflow.test_gate_timeout. For Xcode suites: xcodebuild collects a sysdiagnose into the .xcresult by default (~10 minutes on a passing suite) — add '-collect-test-diagnostics never' to the test command or raise workflow.test_gate_timeout."
|
||||
else
|
||||
echo "✗ Post-merge test gate failed (exit code ${TEST_EXIT})"
|
||||
WAVE_FAILURE_COUNT=$((WAVE_FAILURE_COUNT + 1))
|
||||
|
||||
Reference in New Issue
Block a user