Skip to content

Commit f42bbe9

Browse files
authored
Merge branch 'master' into actions/authors-update
2 parents 52ceb80 + 5c1adda commit f42bbe9

File tree

1,230 files changed

+15901
-18654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,230 files changed

+15901
-18654
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const hacks = [
1818
'eslint-plugin-markdown',
1919
'@babel/eslint-parser',
2020
'@babel/plugin-syntax-class-properties',
21+
'@babel/plugin-syntax-import-assertions',
2122
'@babel/plugin-syntax-top-level-await',
2223
];
2324
Module._findPath = (request, paths, isMain) => {
@@ -41,6 +42,7 @@ module.exports = {
4142
babelOptions: {
4243
plugins: [
4344
Module._findPath('@babel/plugin-syntax-class-properties'),
45+
Module._findPath('@babel/plugin-syntax-import-assertions'),
4446
Module._findPath('@babel/plugin-syntax-top-level-await'),
4547
],
4648
},

.github/workflows/authors.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: "authors update"
22
on:
3+
schedule:
4+
# Run once a week at 00:05 AM UTC on Sunday.
5+
- cron: '5 0 * * 0'
6+
37
workflow_dispatch:
48

59
jobs:

.github/workflows/build-windows.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ env:
1818
jobs:
1919
build-windows:
2020
if: github.event.pull_request.draft == false
21-
runs-on: windows-latest
21+
strategy:
22+
matrix:
23+
windows: [windows-2019, windows-2022]
24+
fail-fast: false
25+
runs-on: ${{ matrix.windows }}
2226
steps:
2327
- uses: actions/checkout@v2
2428
- name: Set up Python ${{ env.PYTHON_VERSION }}

.github/workflows/comment-labeled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Post stalled comment
1414
env:
15-
COMMENTS_URL: ${{ github.event.issue.comments_url || github.event.pull_request.comments_url }}
15+
COMMENTS_URL: ${{ github.event.issue.comments_url || github.event.pull_request.comments_url }}
1616
run: |
1717
curl -X POST $COMMENTS_URL \
1818
-H "Content-Type: application/json" \

.github/workflows/coverage-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Report JS
4646
run: npx c8 report --check-coverage
4747
env:
48-
NODE_OPTIONS: --max-old-space-size=8192
48+
NODE_OPTIONS: --max-old-space-size=8192
4949
- name: Report C++
5050
run: cd out && gcovr --gcov-exclude='.*\b(deps|usr|out|obj|cctest|embedding)\b' -v -r Release/obj.target --xml -o ../coverage/coverage-cxx.xml --root=$(cd ../ && pwd)
5151
# Clean temporary output from gcov and c8, so that it's not uploaded:

.github/workflows/find-inactive-collaborators.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
find:
16-
16+
1717
runs-on: ubuntu-latest
1818

1919
steps:

.github/workflows/linters.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,23 @@ jobs:
9090
- name: Lint Python
9191
run: |
9292
make lint-py-build || true
93-
NODE=$(command -v node) make lint-py
93+
make lint-py
94+
lint-yaml:
95+
if: github.event.pull_request.draft == false
96+
runs-on: ubuntu-latest
97+
steps:
98+
- uses: actions/checkout@v2
99+
- name: Use Python ${{ env.PYTHON_VERSION }}
100+
uses: actions/setup-python@v2
101+
with:
102+
python-version: ${{ env.PYTHON_VERSION }}
103+
- name: Environment Information
104+
run: npx envinfo
105+
- name: Lint YAML
106+
run: |
107+
make lint-yaml-build || true
108+
make lint-yaml
109+
94110
lint-sh:
95111
if: github.event.pull_request.draft == false
96112
runs-on: ubuntu-20.04

.github/workflows/notify-force-push.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111
if: ${{ github.event.forced && github.repository == 'nodejs/node' }}
1212
runs-on: ubuntu-latest
1313
steps:
14-
- name: Slack Notification
15-
uses: rtCamp/action-slack-notify@master
16-
env:
17-
SLACK_COLOR: '#DE512A'
18-
SLACK_ICON: https://github.com/nodejs.png?size=48
19-
SLACK_TITLE: '${{ github.actor }} force-pushed to ${{ github.ref }}'
20-
SLACK_MESSAGE: |
21-
A commit was force-pushed to <https://github.com/${{ github.repository }}/tree/${{ github.repository.default_branch }}|${{ github.repository }}@${{ github.repository.default_branch }}> by <https://github.com/${{ github.actor }}|${{ github.actor }}>
14+
- name: Slack Notification
15+
uses: rtCamp/action-slack-notify@master
16+
env:
17+
SLACK_COLOR: '#DE512A'
18+
SLACK_ICON: https://github.com/nodejs.png?size=48
19+
SLACK_TITLE: '${{ github.actor }} force-pushed to ${{ github.ref }}'
20+
SLACK_MESSAGE: |
21+
A commit was force-pushed to <https://github.com/${{ github.repository }}/tree/${{ github.repository.default_branch }}|${{ github.repository }}@${{ github.repository.default_branch }}> by <https://github.com/${{ github.actor }}|${{ github.actor }}>
2222
23-
Before: <https://github.com/${{ github.repository }}/commit/${{ github.event.before }}|${{ github.event.before }}>
24-
After: <https://github.com/${{ github.repository }}/commit/${{ github.event.after }}|${{ github.event.after }}>
25-
SLACK_USERNAME: nodejs-bot
26-
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
23+
Before: <https://github.com/${{ github.repository }}/commit/${{ github.event.before }}|${{ github.event.before }}>
24+
After: <https://github.com/${{ github.repository }}/commit/${{ github.event.after }}|${{ github.event.after }}>
25+
SLACK_USERNAME: nodejs-bot
26+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@
99
!deps/**/.*
1010
!test/fixtures/**/.*
1111
!.clang-format
12+
!.cpplint
1213
!.editorconfig
1314
!.eslintignore
1415
!.eslintrc.js
16+
!.eslintrc.yaml
1517
!.flake8
1618
!.gitattributes
1719
!.github
1820
!.gitignore
1921
!.gitkeep
2022
!.mailmap
2123
!.nycrc
22-
!.eslintrc.yaml
23-
!.cpplint
24+
!.yamllint.yaml
2425

2526
# === Rules for root dir ===
2627
/core

.mailmap

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,16 @@ Micleusanu Nicu <[email protected]>
287287
Miguel Angel Asencio Hurtado <[email protected]>
288288
Mikael Bourges-Sevenier <[email protected]> <[email protected]>
289289
290+
290291
Minqi Pan <[email protected]>
291292
Minuk Park <[email protected]>
292293
293294
294-
295+
296+
297+
295298
Mitar Milutinovic <[email protected]>
299+
296300
297301
298302
@@ -301,6 +305,7 @@ Nebu Pookins <[email protected]>
301305
Netto Farah <[email protected]>
302306
Nicholas Kinsey <[email protected]>
303307
308+
304309
305310
Nikolai Vavilov <[email protected]>
306311
Nils Kuhnhenn <[email protected]>

0 commit comments

Comments
 (0)