Skip to content
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

Jump to bottom

tools: move update-npm to dep updaters #47619

Merged
merged 3 commits into from
Apr 26, 2023
Merged

tools: move update-npm to dep updaters #47619

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0ce9fd
tools: move update-npm to dep updaters
marco-ippolito Apr 19, 2023
42acfbf
fix: update base dir
marco-ippolito Apr 21, 2023
e8e0189
fix: npm update file
marco-ippolito Apr 24, 2023
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
29 changes: 16 additions & 13 deletions tools/update-npm.sh → tools/dep_updaters/update-npm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@
set -e
# Shell script to update npm in the source tree to a specific version

BASE_DIR=$(cd "$(dirname "$0")/.." && pwd)
BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)
DEPS_DIR="$BASE_DIR/deps"
[ -z "$NODE" ] && NODE="$BASE_DIR/out/Release/node"
[ -x "$NODE" ] || NODE=$(command -v node)

NPM="$DEPS_DIR/npm/bin/npm-cli.js"

NPM_VERSION=$1

if [ "$#" -le 0 ]; then
Expand All @@ -25,22 +30,17 @@ trap cleanup INT TERM EXIT

cd "$WORKSPACE"

git clone --depth=1 --branch="v$NPM_VERSION" git@github.com:npm/cli.git
cd cli
NPM_TGZ=npm.tgz

echo "Preparing npm release"
NPM_TARBALL="$($NODE "$NPM" view npm@"$NPM_VERSION" dist.tarball)"

make
make release
curl -s "$NPM_TARBALL" > "$NPM_TGZ"

echo "Removing old npm"
rm -rf "$DEPS_DIR/npm"

cd "$DEPS_DIR"
rm -rf npm/
mkdir "$DEPS_DIR/npm"

echo "Copying new npm"

tar zxf "$WORKSPACE/cli/release/npm-$NPM_VERSION.tgz"
tar zxvf "$NPM_TGZ" --strip-component=1 -C "$DEPS_DIR/npm"

echo ""
echo "All done!"
Expand All @@ -49,5 +49,8 @@ echo "Please git add npm, commit the new version, and whitespace-fix:"
echo ""
echo "$ git add -A deps/npm"
echo "$ git commit -m \"deps: upgrade npm to $NPM_VERSION\""
echo "$ git rebase --whitespace=fix main"
echo ""

# The last line of the script should always print the new version,
# as we need to add it to $GITHUB_ENV variable.
echo "NEW_VERSION=$NPM_VERSION"