Skip to content

Commit a63d3c5

Browse files
BridgeARMylesBorins
authored andcommitted
doc: update formatting to fit our 80 chars rule
This will also use a proper indentation as a couple of entries had a extra indentation of two spaces. PR-URL: #17722 Reviewed-By: Jon Moss <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]>
1 parent 59711ae commit a63d3c5

6 files changed

+552
-295
lines changed

doc/guides/building-node-with-ninja.md

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,36 @@
11
# Building Node with Ninja
22

3-
The purpose of this guide is to show how to build Node.js using [Ninja][], as doing so can be significantly quicker than using `make`. Please see [Ninja's site][Ninja] for installation instructions (unix only).
3+
The purpose of this guide is to show how to build Node.js using [Ninja][], as
4+
doing so can be significantly quicker than using `make`. Please see
5+
[Ninja's site][Ninja] for installation instructions (unix only).
46

57
To build Node with ninja, there are 3 steps that must be taken:
68

79
1. Configure the project's OS-based build rules via `./configure --ninja`.
810
2. Run `ninja -C out/Release` to produce a compiled release binary.
911
3. Lastly, make symlink to `./node` using `ln -fs out/Release/node node`.
1012

11-
When running `ninja -C out/Release` you will see output similar to the following if the build has succeeded:
13+
When running `ninja -C out/Release` you will see output similar to the following
14+
if the build has succeeded:
15+
1216
```txt
1317
ninja: Entering directory `out/Release`
1418
[4/4] LINK node, POSTBUILDS
1519
```
1620

17-
The bottom line will change while building, showing the progress as `[finished/total]` build steps.
18-
This is useful output that `make` does not produce and is one of the benefits of using Ninja.
19-
Also, Ninja will likely compile much faster than even `make -j4` (or `-j<number of processor threads on your machine>`).
21+
The bottom line will change while building, showing the progress as
22+
`[finished/total]` build steps. This is useful output that `make` does not
23+
produce and is one of the benefits of using Ninja. Also, Ninja will likely
24+
compile much faster than even `make -j4` (or
25+
`-j<number of processor threads on your machine>`).
2026

2127
## Considerations
2228

23-
Ninja builds vary slightly from `make` builds. If you wish to run `make test` after, `make` will likely still need to rebuild some amount of Node.
29+
Ninja builds vary slightly from `make` builds. If you wish to run `make test`
30+
after, `make` will likely still need to rebuild some amount of Node.
2431

25-
As such, if you wish to run the tests, it can be helpful to invoke the test runner directly, like so:
32+
As such, if you wish to run the tests, it can be helpful to invoke the test
33+
runner directly, like so:
2634
`tools/test.py --mode=release message parallel sequential -J`
2735

2836
## Alias
@@ -31,7 +39,8 @@ As such, if you wish to run the tests, it can be helpful to invoke the test runn
3139

3240
## Producing a debug build
3341

34-
The above alias can be modified slightly to produce a debug build, rather than a release build as shown below:
42+
The above alias can be modified slightly to produce a debug build, rather than a
43+
release build as shown below:
3544
`alias nnodedebug='./configure --ninja && ninja -C out/Debug && ln -fs out/Debug/node node_g'`
3645

3746

doc/guides/maintaining-V8.md

+28-28
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ process.
157157

158158
* Unfixed bugs. The bug exists in the V8 master branch.
159159
* Fixed, but needs backport. The bug may need porting to one or more branches.
160-
* Backporting to active branches.
161-
* Backporting to abandoned branches.
160+
* Backporting to active branches.
161+
* Backporting to abandoned branches.
162162
* Backports identified by the V8 team. Bugs identified by upstream V8 that we
163163
haven't encountered in Node.js yet.
164164

@@ -188,14 +188,14 @@ backport the fix:
188188
* Identify which version of V8 the bug was fixed in.
189189
* Identify if any active V8 branches still contain the bug:
190190
* A tracking bug is needed to request a backport.
191-
* If there isn't already a V8 bug tracking the fix, open a new merge request
192-
bug using this [Node.js specific template][V8TemplateMergeRequest].
193-
* If a bug already exists
194-
* Add a reference to the GitHub issue.
195-
* Attach *merge-request-x.x* labels to the bug for any active branches
196-
that still contain the bug. (e.g. merge-request-5.3,
197-
merge-request-5.4)
198-
* Add ofrobots-at-google.com to the cc list.
191+
* If there isn't already a V8 bug tracking the fix, open a new merge request
192+
bug using this [Node.js specific template][V8TemplateMergeRequest].
193+
* If a bug already exists
194+
* Add a reference to the GitHub issue.
195+
* Attach *merge-request-x.x* labels to the bug for any active branches
196+
that still contain the bug. (e.g. merge-request-5.3,
197+
merge-request-5.4)
198+
* Add ofrobots-at-google.com to the cc list.
199199
* Once the merge has been approved, it should be merged using the
200200
[merge script documented in the V8 wiki][V8MergingPatching]. Merging requires
201201
commit access to the V8 repository. If you don't have commit access you can
@@ -214,24 +214,24 @@ to be cherry-picked in the Node.js repository and V8-CI must test the change.
214214

215215
* For each abandoned V8 branch corresponding to an LTS branch that is affected
216216
by the bug:
217-
* Checkout a branch off the appropriate *vY.x-staging* branch (e.g.
218-
*v6.x-staging* to fix an issue in V8 5.1).
219-
* Cherry-pick the commit(s) from the V8 repository.
220-
* On Node.js < 9.0.0: Increase the patch level version in `v8-version.h`.
221-
This will not cause any problems with versioning because V8 will not
222-
publish other patches for this branch, so Node.js can effectively bump the
223-
patch version.
224-
* On Node.js >= 9.0.0: Increase the `v8_embedder_string` number in
225-
`common.gypi`.
226-
* In some cases the patch may require extra effort to merge in case V8 has
227-
changed substantially. For important issues we may be able to lean on the
228-
V8 team to get help with reimplementing the patch.
229-
* Open a cherry-pick PR on `nodejs/node` targeting the *vY.x-staging* branch
230-
and notify the `@nodejs/v8` team.
231-
* Run the Node.js [V8 CI] in addition to the [Node.js CI].
232-
Note: The CI uses the `test-v8` target in the `Makefile`, which uses
233-
`tools/make-v8.sh` to reconstruct a git tree in the `deps/v8` directory to
234-
run V8 tests.
217+
* Checkout a branch off the appropriate *vY.x-staging* branch (e.g.
218+
*v6.x-staging* to fix an issue in V8 5.1).
219+
* Cherry-pick the commit(s) from the V8 repository.
220+
* On Node.js < 9.0.0: Increase the patch level version in `v8-version.h`.
221+
This will not cause any problems with versioning because V8 will not
222+
publish other patches for this branch, so Node.js can effectively bump the
223+
patch version.
224+
* On Node.js >= 9.0.0: Increase the `v8_embedder_string` number in
225+
`common.gypi`.
226+
* In some cases the patch may require extra effort to merge in case V8 has
227+
changed substantially. For important issues we may be able to lean on the
228+
V8 team to get help with reimplementing the patch.
229+
* Open a cherry-pick PR on `nodejs/node` targeting the *vY.x-staging* branch
230+
and notify the `@nodejs/v8` team.
231+
* Run the Node.js [V8 CI] in addition to the [Node.js CI].
232+
Note: The CI uses the `test-v8` target in the `Makefile`, which uses
233+
`tools/make-v8.sh` to reconstruct a git tree in the `deps/v8` directory to
234+
run V8 tests.
235235

236236
The [`update-v8`] tool can be used to simplify this task. Run
237237
`update-v8 backport --sha=SHA` to cherry-pick a commit.

doc/guides/maintaining-npm.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ $ git checkout vX.Y.Z
2121
$ make release
2222
```
2323

24-
Note: please run `npm dist-tag ls npm` and make sure this is the `latest` **dist-tag**. `latest` on git is usually released as `next` when it's time to downstream
24+
Note: please run `npm dist-tag ls npm` and make sure this is the `latest`
25+
**dist-tag**. `latest` on git is usually released as `next` when it's time to
26+
downstream
2527

2628
## Step 3: Remove old npm
2729

doc/onboarding-extras.md

+34-16
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
| upgrading npm | @fishrock123, @MylesBorins |
4343
| upgrading V8 | @nodejs/v8, @nodejs/post-mortem |
4444

45-
When things need extra attention, are controversial, or `semver-major`: @nodejs/tsc
45+
When things need extra attention, are controversial, or `semver-major`:
46+
@nodejs/tsc
4647

4748
If you cannot find who to cc for a file, `git shortlog -n -s <file>` may help.
4849

@@ -51,12 +52,14 @@ If you cannot find who to cc for a file, `git shortlog -n -s <file>` may help.
5152

5253
### By Subsystem
5354

54-
We generally sort issues by a concept of "subsystem" so that we know what part(s) of the codebase it touches.
55+
We generally sort issues by a concept of "subsystem" so that we know what
56+
part(s) of the codebase it touches.
5557

5658
**Subsystems generally are**:
5759

5860
* `lib/*.js`
59-
* `doc`, `build`, `tools`, `test`, `deps`, `lib / src` (special), and there may be others.
61+
* `doc`, `build`, `tools`, `test`, `deps`, `lib / src` (special), and there may
62+
be others.
6063
* `meta` for anything non-code (process) related
6164

6265
There may be more than one subsystem valid for any particular issue / PR.
@@ -74,13 +77,19 @@ Please use these when possible / appropriate
7477
--
7578

7679
* `semver-{minor,major}`
77-
* be conservative – that is, if a change has the remote *chance* of breaking something, go for semver-major
80+
* be conservative – that is, if a change has the remote *chance* of breaking
81+
something, go for semver-major
7882
* when adding a semver label, add a comment explaining why you're adding it
79-
* minor vs. patch: roughly: "does it add a new method / does it add a new section to the docs"
80-
* major vs. everything else: run last versions tests against this version, if they pass, **probably** minor or patch
81-
* A breaking change helper ([full source](https://gist.github.com/chrisdickinson/ba532fa0e4e243fb7b44)):
83+
* minor vs. patch: roughly: "does it add a new method / does it add a new
84+
section to the docs"
85+
* major vs. everything else: run last versions tests against this version, if
86+
they pass, **probably** minor or patch
87+
* A breaking change helper
88+
([full source](https://gist.github.com/chrisdickinson/ba532fa0e4e243fb7b44)):
8289
```sh
83-
git checkout $(git show -s --pretty='%T' $(git show-ref -d $(git describe --abbrev=0) | tail -n1 | awk '{print $1}')) -- test; make -j4 test
90+
SHOW=$(git show-ref -d $(git describe --abbrev=0) | tail -n1 | awk '{print $1}')
91+
git checkout $(git show -s --pretty='%T' $SHOW) -- test
92+
make -j4 test
8493
```
8594

8695
### LTS/Version labels
@@ -92,21 +101,28 @@ We use labels to keep track of which branches a commit should land on:
92101
* Also used when the work of backporting a change outweighs the benefits
93102
* `land-on-v?.x`
94103
* Used by releasers to mark a PR as scheduled for inclusion in an LTS release
95-
* Applied to the original PR for clean cherry-picks, to the backport PR otherwise
104+
* Applied to the original PR for clean cherry-picks, to the backport PR
105+
otherwise
96106
* `backport-requested-v?.x`
97-
* Used to indicate that a PR needs a manual backport to a branch in order to land the changes on that branch
98-
* Typically applied by a releaser when the PR does not apply cleanly or it breaks the tests after applying
107+
* Used to indicate that a PR needs a manual backport to a branch in order to
108+
land the changes on that branch
109+
* Typically applied by a releaser when the PR does not apply cleanly or it
110+
breaks the tests after applying
99111
* Will be replaced by either `dont-land-on-v?.x` or `backported-to-v?.x`
100112
* `backported-to-v?.x`
101113
* Applied to PRs for which a backport PR has been merged
102114
* `lts-watch-v?.x`
103-
* Applied to PRs which the LTS working group should consider including in a LTS release
104-
* Does not indicate that any specific action will be taken, but can be effective as messaging to non-collaborators
115+
* Applied to PRs which the LTS working group should consider including in a
116+
LTS release
117+
* Does not indicate that any specific action will be taken, but can be
118+
effective as messaging to non-collaborators
105119
* `lts-agenda`
106120
* For things that need discussion by the LTS working group
107-
* (for example semver-minor changes that need or should go into an LTS release)
121+
* (for example semver-minor changes that need or should go into an LTS
122+
release)
108123
* `v?.x`
109-
* Automatically applied to changes that do not target `master` but rather the `v?.x-staging` branch
124+
* Automatically applied to changes that do not target `master` but rather the
125+
`v?.x-staging` branch
110126

111127
Once a release line enters maintenance mode, the corresponding labels do not
112128
need to be attached anymore, as only important bugfixes will be included.
@@ -126,6 +142,7 @@ need to be attached anymore, as only important bugfixes will be included.
126142
* `git remote add upstream git://github.com/nodejs/node.git`
127143

128144
to update from nodejs/node:
145+
129146
* `git checkout master`
130147
* `git remote update -p` OR `git fetch --all` (I prefer the former)
131148
* `git merge --ff-only upstream/master` (or `REMOTENAME/BRANCH`)
@@ -135,5 +152,6 @@ to update from nodejs/node:
135152

136153
* commit often, out to your github fork (origin), open a PR
137154
* when making PRs make sure to spend time on the description:
138-
* every moment you spend writing a good description quarters the amount of time it takes to understand your code.
155+
* every moment you spend writing a good description quarters the amount of
156+
time it takes to understand your code.
139157
* usually prefer to only squash at the *end* of your work, depends on the change

0 commit comments

Comments
 (0)