Skip to content

fix(ci): reuse native preview installations #2693

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
fengmk2 merged 2 commits into from
Sep 17, 2026
+12 −6
Merged

fix(ci): reuse native preview installations #2693

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1db88d
fix(ci): reuse native preview installations
fengmk2 Sep 14, 2026
4ca740a
Merge branch 'main' into fix/preview-harness-native-cache
fengmk2 Sep 17, 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
18 changes: 12 additions & 6 deletions .github/scripts/test-pkg-pr-new-migrate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,12 @@ cache_root="${XDG_CACHE_HOME:-$original_home/.cache}"
pr_home="${VP_PKG_PR_NEW_HOME:-$cache_root/vite-plus/pkg-pr-new/$pr_ref}"
installer_home="$(mktemp -d "${TMPDIR:-/tmp}/vite-plus-pr-installer.XXXXXX")"

cached_version_dir="$pr_home/pkg-pr-new-$resolved_ref"
vp_bin="$pr_home/bin/vp"
vite_plus_package_json="$pr_home/current/node_modules/vite-plus/package.json"
global_cli_entry="$pr_home/current/node_modules/vite-plus/dist/bin.js"
commit_marker="$cached_version_dir/.pkg-pr-new-commit"
# Follow the installer's active directory: native setup uses the commit version,
# while the legacy installer uses pkg-pr-new-<sha>.
commit_marker="$pr_home/current/.pkg-pr-new-commit"

read_installed_commit() {
if [ -f "$commit_marker" ]; then
Expand All @@ -139,7 +140,8 @@ read_installed_commit() {

if [ -f "$vite_plus_package_json" ]; then
awk -F '"' '
$2 == "@voidzero-dev/vite-plus-core" {
$2 == "@voidzero-dev/vite-plus-core" ||
($2 == "vite" && $4 ~ /^npm:@voidzero-dev\/vite-plus-core@/) {
value = $4
sub(/^.*@/, "", value) # pkg.pr.new URL form: keep trailing sha
sub(/^0\.0\.0-commit\./, "", value) # registry bridge version form: keep sha
Expand All @@ -153,9 +155,13 @@ read_installed_commit() {
installed_commit="$(read_installed_commit || true)"
current_target="$(readlink "$pr_home/current" 2>/dev/null || true)"
reuse_install=0
current_target_matches=0
case "$current_target" in
"$commit_version" | "$commit_version"+force.* | "pkg-pr-new-$resolved_ref") current_target_matches=1 ;;
esac

if [ "$installed_commit" = "$resolved_ref" ] &&
[ "$current_target" = "pkg-pr-new-$resolved_ref" ] &&
[ "$current_target_matches" -eq 1 ] &&
[ -x "$vp_bin" ] &&
[ -f "$vite_plus_package_json" ] &&
[ -f "$global_cli_entry" ]; then
Expand All @@ -168,7 +174,6 @@ cleanup() {
trap cleanup EXIT

if [ "$reuse_install" -eq 1 ]; then
printf '%s\n' "$resolved_ref" > "$commit_marker"
echo "Reusing installed Vite+ pkg.pr.new build $resolved_ref (requested $pr_ref) from $pr_home"
else
if [ -n "$installed_commit" ] && [ "$installed_commit" != "$resolved_ref" ]; then
Expand Down Expand Up @@ -200,7 +205,6 @@ else
if [ -n "$previous_target" ]; then
rm -rf "$pr_home/$previous_target"
fi
printf '%s\n' "$resolved_ref" > "$commit_marker"
fi

if [ ! -x "$vp_bin" ]; then
Expand All @@ -218,6 +222,8 @@ if [ ! -f "$global_cli_entry" ]; then
exit 1
fi

printf '%s\n' "$resolved_ref" > "$commit_marker"

vitest_version="$(awk -F '"' '$2 == "vitest" { print $4; exit }' "$vite_plus_package_json")"
if [ -z "$vitest_version" ]; then
echo "error: could not determine the bundled Vitest version from $vite_plus_package_json" >&2
Expand Down
Loading