Skip to content

Commit

Permalink
Merge remote-tracking branch 'node/master' into wpt/user-timing
Browse files Browse the repository at this point in the history
# Conflicts:
#	test/fixtures/wpt/README.md
  • Loading branch information
legendecas committed Jul 19, 2021
2 parents 7d17e62 + d0b440c commit 188e801
Show file tree
Hide file tree
Showing 269 changed files with 32,430 additions and 28,137 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
# tls/crypto

/lib/internal/crypto/* @nodejs/crypto
/lib/internal/tls.js @nodejs/crypto @nodejs/net
/lib/internal/tls/* @nodejs/crypto @nodejs/net
/lib/crypto.js @nodejs/crypto
/lib/tls.js @nodejs/crypto @nodejs/net
/src/node_crypto* @nodejs/crypto
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-tarball.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Build from tarball

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
push:
branches:
- master
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: build-windows

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
push:
branches:
- master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commit-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
# Last 100 commits should be enough for a PR
fetch-depth: 100
- name: Use Node.js 12
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 12.x
- name: Validate commit messages
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/coverage-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: coverage-linux

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths-ignore:
- 'doc/**'
- 'deps/**'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/coverage-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: coverage-windows

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths-ignore:
- 'doc/**'
- 'deps/**'
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/find-inactive-collaborators.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Find inactive collaborators

on:
schedule:
# Run on the 15th day of the month at 4:05 AM UTC.
- cron: '5 4 15 * *'

workflow_dispatch:

env:
NODE_VERSION: 16.x
NUM_COMMITS: 5000

jobs:
find:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
fetch-depth: ${{ env.NUM_COMMITS }}

- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}

- name: Find inactive collaborators
run: tools/find-inactive-collaborators.mjs ${{ env.NUM_COMMITS }}
1 change: 1 addition & 0 deletions .github/workflows/label-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ jobs:
steps:
- uses: nodejs/node-pr-labeler@v1
with:
repo-token: ${{ secrets.GH_USER_TOKEN }}
configuration-path: .github/label-pr-config.yml
1 change: 1 addition & 0 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: linters

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
push:
branches:
- master
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: misc

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
push:
branches:
- master
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
paths-ignore:
- 'doc/**'
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths-ignore:
- 'doc/**'

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: test-linux

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
push:
branches:
- master
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: test-macOS

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths-ignore:
- 'doc/**'
push:
Expand Down
5 changes: 4 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ Danielle Adams <[email protected]> Danielle Adams <[email protected]
Danny Nemer <[email protected]> <[email protected]>
Danny Nemer <[email protected]> <[email protected]>
Darshan Sen <[email protected]>
Darshan Sen <[email protected]> <[email protected]>
Dave Pacheco <[email protected]> <[email protected]>
David Cai <[email protected]> DavidCai <[email protected]>
David Mark Clements <[email protected]>
Expand Down Expand Up @@ -162,6 +163,8 @@ Hendrik Schwalm <[email protected]> hschwalm <[email protected]>
Hitesh Kanwathirtha <[email protected]> <[email protected]>
Henry Chin <[email protected]>
Herbert Vojčík <[email protected]>
himself65 <[email protected]> <[email protected]>
himself65 <[email protected]> <[email protected]>
Icer Liang <[email protected]> <[email protected]>
Igor Savin <[email protected]> kibertoad <[email protected]>
Igor Soarez <[email protected]>
Expand Down Expand Up @@ -391,7 +394,7 @@ Surya Panikkal <[email protected]> suryagh <[email protected]>
Taehee Kang <[email protected]> hugnosis <[email protected]>
Tanuja-Sawant <[email protected]> <[email protected]>
Taylor Woll <[email protected]> taylor.woll <[email protected]>
Thomas Watson Steen <[email protected]> Thomas Watson <[email protected]>
Thomas Watson <[email protected]>
Timothy O. Peters <[email protected]>
Timur Shemsedinov <[email protected]> tshemsedinov <[email protected]>
Ting Shao <[email protected]>
Expand Down
14 changes: 11 additions & 3 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ Yoshiya Hinosawa <[email protected]>
Syuhei Kobayashi <[email protected]>
YutamaKotaro <[email protected]>
MURAKAMI Masahiko <[email protected]>
Thomas Watson Steen <[email protected]>
Thomas Watson <[email protected]>
Daijiro Yamada <[email protected]>
Kelvin Jin <[email protected]>
Mitsuo Utano <[email protected]>
Expand Down Expand Up @@ -2682,7 +2682,7 @@ Alexander Sattelmaier <[email protected]>
Avi ד <[email protected]>
Thomas <[email protected]>
Aymen Naghmouchi <[email protected]>
himself65 <[email protected]>
himself65 <[email protected]>
Geir Hauge <[email protected]>
Patrick Gansterer <[email protected]>
Nicolas Moteau <[email protected]>
Expand Down Expand Up @@ -2740,7 +2740,6 @@ Alba Mendez <[email protected]>
zero1five <[email protected]>
Gaelan <[email protected]>
Jacob <[email protected]>
himself65 <[email protected]>
Dan Beglin <[email protected]>
Anish Asrani <[email protected]>
teams2ua <[email protected]>
Expand Down Expand Up @@ -3319,5 +3318,14 @@ Houssem Chebab <[email protected]>
Davidson Francis <[email protected]>
Rohan Sharma <[email protected]>
AkshayK <[email protected]>
FrankEntriken <[email protected]>
Cyrille Bourgois <[email protected]>
Jacob <[email protected]>
ejose19 <[email protected]>
Tobias Koppers <[email protected]>
Makoto Kato <[email protected]>
foxxyz <[email protected]>
LitoMore <[email protected]>
nerdthatnoonelikes <[email protected]>

# Generated by tools/update-authors.js
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ $ make test-only

At this point, you are ready to make code changes and re-run the tests.

If you are running tests before submitting a Pull Request, the recommended
If you are running tests before submitting a pull request, the recommended
command is:

```console
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.4.2">16.4.2</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.5.0">16.5.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.4.2">16.4.2</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.4.1">16.4.1</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.4.0">16.4.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.3.0">16.3.0</a><br/>
Expand Down
50 changes: 25 additions & 25 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,32 @@ See:

## Collaborators

Node.js Core Collaborators maintain the [nodejs/node][] GitHub repository.
The GitHub team for Node.js Core Collaborators is @nodejs/collaborators.
Node.js core collaborators maintain the [nodejs/node][] GitHub repository.
The GitHub team for Node.js core collaborators is @nodejs/collaborators.
Collaborators have:

* Commit access to the [nodejs/node][] repository
* Access to the Node.js continuous integration (CI) jobs

Both Collaborators and non-Collaborators may propose changes to the Node.js
Both collaborators and non-collaborators may propose changes to the Node.js
source code. The mechanism to propose such a change is a GitHub pull request.
Collaborators review and merge (_land_) pull requests.

Two Collaborators must approve a pull request before the pull request can land.
(One Collaborator approval is enough if the pull request has been open for more
than 7 days.) Approving a pull request indicates that the Collaborator accepts
responsibility for the change. Approval must be from Collaborators who are not
Two collaborators must approve a pull request before the pull request can land.
(One collaborator approval is enough if the pull request has been open for more
than 7 days.) Approving a pull request indicates that the collaborator accepts
responsibility for the change. Approval must be from collaborators who are not
authors of the change.

If a Collaborator opposes a proposed change, then the change cannot land. The
If a collaborator opposes a proposed change, then the change cannot land. The
exception is if the TSC votes to approve the change despite the opposition.
Usually, involving the TSC is unnecessary. Often, discussions or further changes
result in Collaborators removing their opposition.
result in collaborators removing their opposition.

See:

* [List of Collaborators](./README.md#current-project-team-members)
* [A guide for Collaborators](./doc/guides/collaborator-guide.md)
* [List of collaborators](./README.md#current-project-team-members)
* [A guide for collaborators](./doc/guides/collaborator-guide.md)

### Collaborator activities

Expand All @@ -63,20 +63,20 @@ See:
* Participation in working groups
* Merging pull requests

The TSC can remove inactive Collaborators or provide them with _Emeritus_
The TSC can remove inactive collaborators or provide them with _Emeritus_
status. Emeriti may request that the TSC restore them to active status.

## Technical Steering Committee

A subset of the Collaborators forms the Technical Steering Committee (TSC).
A subset of the collaborators forms the Technical Steering Committee (TSC).
The TSC has final authority over this project, including:

* Technical direction
* Project governance and process (including this policy)
* Contribution policy
* GitHub repository hosting
* Conduct guidelines
* Maintaining the list of Collaborators
* Maintaining the list of collaborators

The current list of TSC members is in
[the project README](./README.md#current-project-team-members).
Expand All @@ -95,7 +95,7 @@ agenda is not to review or approve all patches. Collaborators review and approve
patches on GitHub.

Any community member can create a GitHub issue asking that the TSC review
something. If consensus-seeking fails for an issue, a Collaborator may apply the
something. If consensus-seeking fails for an issue, a collaborator may apply the
`tsc-agenda` label. That will add it to the TSC meeting agenda.

Before each TSC meeting, the meeting chair will share the agenda with members of
Expand All @@ -120,11 +120,11 @@ the issue tracker is:

## Collaborator nominations

Existing Collaborators can nominate someone to become a Collaborator. Nominees
Existing collaborators can nominate someone to become a collaborator. Nominees
should have significant and valuable contributions across the Node.js
organization.

To nominate a new Collaborator, open an issue in the [nodejs/node][] repository.
To nominate a new collaborator, open an issue in the [nodejs/node][] repository.
Provide a summary of the nominee's contributions. For example:

* Commits in the [nodejs/node][] repository.
Expand All @@ -144,25 +144,25 @@ Provide a summary of the nominee's contributions. For example:
organization
* Other participation in the wider Node.js community

Mention @nodejs/collaborators in the issue to notify other Collaborators about
Mention @nodejs/collaborators in the issue to notify other collaborators about
the nomination.

The nomination passes if no Collaborators oppose it after one week. Otherwise,
The nomination passes if no collaborators oppose it after one week. Otherwise,
the nomination fails.

There are steps a nominator can take in advance to make a nomination as
frictionless as possible. To request feedback from other Collaborators in
private, use the [Collaborators discussion page][]
(which only Collaborators may view). A nominator may also work with the
frictionless as possible. To request feedback from other collaborators in
private, use the [collaborators discussion page][]
(which only collaborators may view). A nominator may also work with the
nominee to improve their contribution profile.

Collaborators might overlook someone with valuable contributions. In that case,
the contributor may open an issue or contact a Collaborator to request a
the contributor may open an issue or contact a collaborator to request a
nomination.

### Onboarding

After the nomination passes, a TSC member onboards the new Collaborator. See
After the nomination passes, a TSC member onboards the new collaborator. See
[the onboarding guide](./onboarding.md) for details of the onboarding
process.

Expand All @@ -171,7 +171,7 @@ process.
The TSC follows a [Consensus Seeking][] decision-making model per the
[TSC Charter][].

[Collaborators discussion page]: https://github.com/orgs/nodejs/teams/collaborators/discussions
[Consensus Seeking]: https://en.wikipedia.org/wiki/Consensus-seeking_decision-making
[TSC Charter]: https://github.com/nodejs/TSC/blob/HEAD/TSC-Charter.md
[collaborators discussion page]: https://github.com/orgs/nodejs/teams/collaborators/discussions
[nodejs/node]: https://github.com/nodejs/node
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ The externally maintained libraries used by Node.js are:
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"""

- gtest, located at src/gtest and test/cctest/gtest, is licensed as follows:
- gtest, located at deps/googletest, is licensed as follows:
"""
Copyright 2008, Google Inc.
All rights reserved.
Expand Down
Loading

0 comments on commit 188e801

Please sign in to comment.