Skip to content

Bootstrap: sync gen-0 sidecar stamp after #14818 spine edit #14832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PurHur merged 2 commits into from
Jul 2, 2026
Merged

Bootstrap: sync gen-0 sidecar stamp after #14818 spine edit #14832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1b8e10
Fix gen-0 sidecar stamp drift after StringJsonEncodeInventoryStubs sp…
PurHur Jul 2, 2026
fcff985
Merge origin/master; refresh sidecar stamp for StringBitwiseNotJitHel…
PurHur Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion prelinked/bootstrap-gen0/.m3_compiler_lib_sidecar.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e62d3ec969206c7e4e364eafed00dc9839590dee
046998584f26f4183fcc226d3f306083ae2f237d
6 changes: 5 additions & 1 deletion script/bootstrap-selfhost-lib-spine-smoke-link.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ if [[ "${run_code}" -eq 139 ]]; then
bootstrap_spine_emit_crash_diag "${OUT}" "${OUT}"
fi
out="${run_out}"
vm_driver_probe_ok=0
if ! grep -q 'compiler_lib_spine_smoke bundle OK' <<< "${out}"; then
set +e
probe_out="$(env PHP_COMPILER_VM_DRIVER_EXECUTE=1 "${OUT}" 2>&1)"
Expand All @@ -255,6 +256,7 @@ if ! grep -q 'compiler_lib_spine_smoke bundle OK' <<< "${out}"; then
if [[ "${probe_code}" -eq 0 ]] && grep -q 'vm driver ok' <<< "${probe_out}"; then
echo "bootstrap-selfhost-lib-spine-smoke-link: bundle run failed but VM driver env probe OK (#8559)" >&2
out="${probe_out}"
vm_driver_probe_ok=1
else
echo "bootstrap-selfhost-lib-spine-smoke-link: unexpected stdout (want compiler_lib_spine_smoke bundle OK)" >&2
printf '%s\n' "${out}" >&2
Expand All @@ -264,7 +266,9 @@ fi
want_sha="$(bootstrap_compiler_lib_spine_entry_sha)" || true
if [[ -n "${want_sha:-}" ]]; then
refresh_sidecar=0
if strings "${OUT}" 2>/dev/null | grep -q 'vm driver ok'; then
if [[ "${vm_driver_probe_ok}" == "1" ]]; then
refresh_sidecar=1
elif strings "${OUT}" 2>/dev/null | grep -q 'vm driver ok'; then
refresh_sidecar=1
elif [[ -x "${OUT}" ]] && grep -q 'compiler_lib_spine_smoke bundle OK' <<< "${out}"; then
# Native full-spine emit succeeded; refresh sidecar even when env-probe strings
Expand Down
2 changes: 2 additions & 0 deletions test/unit/BootstrapLibSpineVmSmokeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public function testLibSpineLinkScriptSeedsSidecarsAndRefusesZendFallback(): voi
$this->assertStringContainsString('inventory argv driver unavailable (no Zend — #8716)', $script);
$this->assertStringContainsString('BOOTSTRAP_LIB_SPINE_SMOKE_GEN0_FALLBACK', $script);
$this->assertStringContainsString('BOOTSTRAP_NO_ZEND_FALLBACK:-0}" != "1"', $script);
$this->assertStringContainsString('vm_driver_probe_ok=1', $script);
$this->assertStringContainsString('vm_driver_probe_ok}" == "1"', $script);
}

public function testSpineEntryBundlesBinVmPhp(): void
Expand Down