diff --git a/enos/modules/build_local/templates/build.sh b/enos/modules/build_local/templates/build.sh index a3807f4d6..160bd2f80 100755 --- a/enos/modules/build_local/templates/build.sh +++ b/enos/modules/build_local/templates/build.sh @@ -7,7 +7,7 @@ set -eux -o pipefail env # Requirements -npm install --global yarn || true +npm install --global pnpm || true # Go to the root of the boundary repo root_dir="$(git rev-parse --show-toplevel)" diff --git a/enos/modules/test_e2e_ui/main.tf b/enos/modules/test_e2e_ui/main.tf index 72896bce3..f026c04c3 100644 --- a/enos/modules/test_e2e_ui/main.tf +++ b/enos/modules/test_e2e_ui/main.tf @@ -238,7 +238,7 @@ resource "enos_local_exec" "run_e2e_test" { E2E_WORKER_TAG_EGRESS = var.worker_tag_egress } - inline = var.debug_no_run ? [""] : ["set -o pipefail; PATH=\"${var.local_boundary_dir}:$PATH\" yarn --cwd ${var.local_boundary_ui_src_dir}/ui/admin run e2e 2>&1 | tee ${path.module}/../../test-e2e-ui.log"] + inline = var.debug_no_run ? [""] : ["set -o pipefail; PATH=\"${var.local_boundary_dir}:$PATH\" pnpm --cwd ${var.local_boundary_ui_src_dir}/ui/admin run e2e 2>&1 | tee ${path.module}/../../test-e2e-ui.log"] } output "test_results" { diff --git a/scripts/build-ui.sh b/scripts/build-ui.sh index 36e1f93ef..89e6c03cc 100755 --- a/scripts/build-ui.sh +++ b/scripts/build-ui.sh @@ -58,8 +58,8 @@ if which gh &> /dev/null; then fi fi -if ! which yarn &> /dev/null; then - echo "Yarn must be installed to build ui assets from a git clone.\nPlease ensure Node v14+ and Yarn v1.22.10+ are installed." +if ! which pnpm &> /dev/null; then + echo "Pnpm must be installed to build ui assets from a git clone.\nPlease ensure Node v20+ and Pnpm v10+ are installed." exit 1 fi @@ -81,6 +81,6 @@ git checkout "${UI_COMMITISH}" git pull --ff-only origin "${UI_COMMITISH}" git reset --hard "${UI_COMMITISH}" -yarn install -EDITION=${UI_EDITION} yarn build +pnpm install +EDITION=${UI_EDITION} pnpm build popd