Skip to content

fix(cli): support GitLab setup-vp legacy layout #2520

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 1 commit into from
Aug 21, 2026
Merged

fix(cli): support GitLab setup-vp legacy layout #2520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion .github/workflows/test-standalone-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ jobs:
cat "$OUTPUT"
grep -F "Set VP_BIN_DIR, VP_DATA_DIR, and VP_CACHE_DIR together" "$OUTPUT"

- name: Existing setup-vp uses legacy layout
- name: Existing GitHub setup-vp uses legacy layout
run: |
set -euo pipefail
LEGACY=$(mktemp -d)
Expand All @@ -252,6 +252,27 @@ jobs:
test "$(readlink "$LEGACY/.vite-plus/bin/vp")" = "$LEGACY/.vite-plus/current/bin/vp"
"$LEGACY/.vite-plus/bin/vp" --version

- name: Existing GitLab setup-vp uses legacy layout
run: |
set -euo pipefail
LEGACY=$(mktemp -d)
FAKE_TGZ=$(mktemp)
export HOME="$LEGACY"
export USERPROFILE="$LEGACY"
unset GITHUB_ACTION_REPOSITORY
export GITLAB_CI=true
export SETUP_VP_SETUP_REF=v1.15.0
unset VP_VPDIRS_AWARE
unset VP_HOME VP_BIN_DIR VP_DATA_DIR VP_CACHE_DIR
unset XDG_DATA_HOME XDG_CACHE_HOME XDG_CONFIG_HOME XDG_STATE_HOME
VP_LOCAL_TGZ="$FAKE_TGZ" VP_VERSION=local-setup-vp-gitlab-legacy bash packages/cli/install.sh

test -e "$LEGACY/.vite-plus/current"
test -e "$LEGACY/.vite-plus/bin/vp"
test ! -d "$LEGACY/.local/share/vite-plus"
test "$(readlink "$LEGACY/.vite-plus/bin/vp")" = "$LEGACY/.vite-plus/current/bin/vp"
"$LEGACY/.vite-plus/bin/vp" --version

- name: Fresh home uses split layout
run: |
set -euo pipefail
Expand Down
11 changes: 7 additions & 4 deletions packages/cli/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,14 @@ resolution_home_dir() {
fi
}

# Released setup-vp versions add ~/.vite-plus/bin to the GitHub Actions PATH.
# They do this after the installer exits. Use the monolithic layout until
# setup-vp declares support for VP_DUMP_DIRS.
# Released setup-vp versions add ~/.vite-plus/bin to the GitHub Actions or
# GitLab CI/CD PATH. They do this after the installer exits. Use the monolithic
# layout until setup-vp declares support for VP_DUMP_DIRS.
enable_setup_vp_legacy_compatibility() {
[ "${GITHUB_ACTION_REPOSITORY:-}" = "voidzero-dev/setup-vp" ] || return 0
if [ "${GITHUB_ACTION_REPOSITORY:-}" != "voidzero-dev/setup-vp" ]; then
[ "${GITLAB_CI:-}" = "true" ] || return 0
[ -n "${SETUP_VP_SETUP_REF:-}" ] || return 0
fi
[ "${VP_VPDIRS_AWARE:-}" != "1" ] || return 0
[ -z "${VP_HOME:-}" ] || return 0
[ -z "${VP_BIN_DIR:-}" ] || return 0
Expand Down
Loading