chore: fix creation of @yarnpkg/cli-dist and artifact updating (#5148)

yarnpkg · Dec 29, 2022 · 2615433 · 2615433
1 parent e479869
commit 2615433
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/scripts/release/01-release-tags.sh b/scripts/release/01-release-tags.sh
@@ -73,7 +73,7 @@ cp "$REPO_DIR"/packages/yarnpkg-cli/bin/yarn.js \
    "$REPO_DIR"/packages/berry-cli/bin/berry.js
 
 # In case the PnP hook got updated run an install to update the `.pnp.cjs` file
-YARN_ENABLE_IMMUTABLE_INSTALLS=0 yarn
+YARN_IGNORE_PATH=1 YARN_ENABLE_IMMUTABLE_INSTALLS=0 node "$REPO_DIR/packages/yarnpkg-cli/bin/yarn.js"
 
 git add "$REPO_DIR"
 git commit -m "$COMMIT_MESSAGE"

diff --git a/scripts/release/03-release-npm.sh b/scripts/release/03-release-npm.sh
@@ -10,7 +10,7 @@ if ! [[ -z $(git status --porcelain) ]]; then
   exit 1
 fi
 
-VERSION=$(YARN_IGNORE_PATH=1 node packages/yarnpkg-cli/bin/yarn.js --version)
+VERSION=$(YARN_IGNORE_PATH=1 node packages/yarnpkg-cli/bundles/yarn.js --version)
 
 TEMP_DIR="$(mktemp -d)"
 mkdir "$TEMP_DIR"/bin
@@ -19,7 +19,7 @@ jq > "$TEMP_DIR"/package.json \
   '{name: "@yarnpkg/cli-dist", version: "'"$VERSION"'", "bin": {"yarn": "bin/yarn.js", "yarnpkg": "bin/yarn.js"}} + (. | {license,repository,engines})' \
   "$REPO_DIR"/packages/yarnpkg-cli/package.json
 
-cp "$REPO_DIR"/packages/yarnpkg-cli/bin/yarn.js "$TEMP_DIR"/bin/yarn.js
+cp "$REPO_DIR"/packages/yarnpkg-cli/bundles/yarn.js "$TEMP_DIR"/bin/yarn.js
 cp "$REPO_DIR"/scripts/dist-scripts/* "$TEMP_DIR"/bin
 chmod +x "$TEMP_DIR"/bin/*