Skip to content

Commit f60729c

Browse files
committed
code review;
1 parent d3830b4 commit f60729c

File tree

5 files changed

+35
-26
lines changed

5 files changed

+35
-26
lines changed

β€Ž.github/workflows/tools.ymlβ€Ž

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,14 @@ jobs:
119119
run: |
120120
make corepack-update
121121
echo "NEW_VERSION=$(node deps/corepack/dist/corepack.js --version)" >> $GITHUB_ENV
122-
- id: doc
122+
- id: doc-kit
123123
subsystem: tools
124124
label: tools
125125
run: |
126-
cd tools/doc
127-
./update.sh
126+
./tools/dep_updaters/update-doc.sh > temp-output
127+
cat temp-output
128+
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
129+
rm temp-output
128130
- id: googletest
129131
subsystem: deps
130132
label: dependencies, test
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/sh
2+
3+
set -ex
4+
5+
BASE_DIR=$(cd "$(dirname "$0")/../.." && pwd)
6+
[ -z "$NODE" ] && NODE="$BASE_DIR/out/Release/node"
7+
[ -x "$NODE" ] || NODE=$(command -v node)
8+
DEPS_DIR="$BASE_DIR/deps"
9+
NPM="$DEPS_DIR/npm/bin/npm-cli.js"
10+
11+
# shellcheck disable=SC1091
12+
. "$BASE_DIR/tools/dep_updaters/utils.sh"
13+
14+
cd "$BASE_DIR/tools/doc"
15+
16+
OLD_VERSION=$(jq '.dependencies["@nodejs/doc-kit"]' package.json)
17+
LATEST_COMMIT=$("$NODE" get-latest-commit.mjs)
18+
NEW_VERSION="https://github.com/nodejs/doc-kit/archive/$LATEST_COMMIT.tar.gz"
19+
20+
compare_dependency_version "doc-kit" $OLD_VERSION $NEW_VERSION
21+
22+
rm -rf node_modules/ package-lock.json
23+
24+
"$NODE" "$NPM" install $NEW_VERSION --omit=dev
25+
26+
finalize_version_update "doc-kit" "$NEW_VERSION"

β€Žtools/doc/package-lock.jsonβ€Ž

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žtools/doc/package.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name": "doc",
33
"private": true,
44
"dependencies": {
5-
"@nodejs/doc-kit": "https://github.com/nodejs/doc-kit/archive/f8758bf06437a20ebe1b46c8c16e8f70c7710bee.tar.gz"
5+
"@nodejs/doc-kit": "https://github.com/nodejs/doc-kit/archive/471bea645a325e043ab2e6a27bd7c856f09ce53c.tar.gz"
66
}
77
}

β€Žtools/doc/update-dockit.shβ€Ž

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
Β (0)