Skip to content

Commit fadab8a

Browse files
mertcanaltinmertcanaltin
authored
Merge branch 'main' into fix/remove-cctest-memory-tracking
2 parents 0c3d8b3 + 8979001 commit fadab8a

6,968 files changed

Lines changed: 1988470 additions & 2005773 deletions

File tree

Some content is hidden

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

‎.configurations/configuration.dsc.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ properties:
3535
- Microsoft.VisualStudio.Workload.NativeDesktop
3636
- Microsoft.VisualStudio.Component.VC.Llvm.Clang
3737
- Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset
38+
- resource: Microsoft.WinGet.DSC/WinGetPackage
39+
id: rustPackage
40+
directives:
41+
description: Install Rust with MSVC toolchain
42+
settings:
43+
id: Rustlang.Rust.MSVC
44+
source: winget
3845
- resource: Microsoft.WinGet.DSC/WinGetPackage
3946
id: gitPackage
4047
directives:
@@ -51,4 +58,4 @@ properties:
5158
settings:
5259
id: Nasm.Nasm
5360
source: winget
54-
configurationVersion: 0.1.1
61+
configurationVersion: 0.2.0

‎.configurations/configuration.vsBuildTools.dsc.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ properties:
3535
- Microsoft.VisualStudio.Workload.VCTools
3636
- Microsoft.VisualStudio.Component.VC.Llvm.Clang
3737
- Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset
38+
- resource: Microsoft.WinGet.DSC/WinGetPackage
39+
id: rustPackage
40+
directives:
41+
description: Install Rust with MSVC toolchain
42+
settings:
43+
id: Rustlang.Rust.MSVC
44+
source: winget
3845
- resource: Microsoft.WinGet.DSC/WinGetPackage
3946
id: gitPackage
4047
directives:
@@ -51,4 +58,4 @@ properties:
5158
settings:
5259
id: Nasm.Nasm
5360
source: winget
54-
configurationVersion: 0.1.1
61+
configurationVersion: 0.2.0

‎.configurations/configuration.vsEnterprise.dsc.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ properties:
3535
- Microsoft.VisualStudio.Workload.NativeDesktop
3636
- Microsoft.VisualStudio.Component.VC.Llvm.Clang
3737
- Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset
38+
- resource: Microsoft.WinGet.DSC/WinGetPackage
39+
id: rustPackage
40+
directives:
41+
description: Install Rust with MSVC toolchain
42+
settings:
43+
id: Rustlang.Rust.MSVC
44+
source: winget
3845
- resource: Microsoft.WinGet.DSC/WinGetPackage
3946
id: gitPackage
4047
directives:
@@ -51,4 +58,4 @@ properties:
5158
settings:
5259
id: Nasm.Nasm
5360
source: winget
54-
configurationVersion: 0.1.1
61+
configurationVersion: 0.2.0

‎.configurations/configuration.vsProfessional.dsc.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ properties:
3535
- Microsoft.VisualStudio.Workload.NativeDesktop
3636
- Microsoft.VisualStudio.Component.VC.Llvm.Clang
3737
- Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset
38+
- resource: Microsoft.WinGet.DSC/WinGetPackage
39+
id: rustPackage
40+
directives:
41+
description: Install Rust with MSVC toolchain
42+
settings:
43+
id: Rustlang.Rust.MSVC
44+
source: winget
3845
- resource: Microsoft.WinGet.DSC/WinGetPackage
3946
id: gitPackage
4047
directives:
@@ -51,4 +58,4 @@ properties:
5158
settings:
5259
id: Nasm.Nasm
5360
source: winget
54-
configurationVersion: 0.1.1
61+
configurationVersion: 0.2.0

‎.editorconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ end_of_line = crlf
1616
indent_size = 8
1717
indent_style = tab
1818

19-
[{deps}/**]
19+
[deps/**]
2020
charset = unset
2121
end_of_line = unset
2222
indent_size = unset
2323
indent_style = unset
24+
insert_final_newline = unset
2425
trim_trailing_whitespace = unset
2526

26-
[{test/fixtures,deps,tools/eslint/node_modules,tools/gyp,tools/icu,tools/msvs}/**]
27+
[{test/fixtures,tools/eslint/node_modules,tools/gyp,tools/icu,tools/msvs}/**]
2728
insert_final_newline = false

‎.github/CODEOWNERS‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,11 @@
243243
# dev container
244244
/.devcontainer/* @nodejs/devcontainer
245245
/doc/contributing/using-devcontainer.md @nodejs/devcontainer
246+
247+
# FFI
248+
/deps/libffi/ @nodejs/ffi
249+
/doc/api/ffi.md @nodejs/ffi
250+
/lib/ffi.js @nodejs/ffi
251+
/src/ffi/ @nodejs/ffi
252+
/src/node_ffi.* @nodejs/ffi
253+
/test/ffi/ @nodejs/ffi

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<!--
2+
If you are submitting a pull request for the first time,
3+
check out the guide for first-time contributors for tips and answers to FAQs:
4+
https://github.com/nodejs/node/blob/HEAD/doc/contributing/first-contributions.md
5+
26
Before submitting a pull request, please read:
37
48
- the CONTRIBUTING guide at https://github.com/nodejs/node/blob/HEAD/CONTRIBUTING.md

‎.github/actions/undici-wpt-current/action.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Run undici WPT (current)
2+
description: Runs undici WPT tests for undici >= 7 and merges results into the Node.js WPT report
3+
4+
inputs:
5+
undici-version:
6+
required: true
7+
description: undici version tag to checkout
8+
wpt-report:
9+
required: true
10+
description: Path to the Node.js WPT report to merge into
11+
12+
runs:
13+
using: composite
14+
steps:
15+
- name: Checkout undici
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
with:
18+
repository: nodejs/undici
19+
persist-credentials: false
20+
path: undici
21+
clean: false
22+
ref: ${{ inputs.undici-version }}
23+
- name: Prepare WPT checkout
24+
shell: bash
25+
run: |
26+
rm -rf undici/test/web-platform-tests/wpt
27+
mv test/fixtures/wpt undici/test/web-platform-tests/wpt
28+
- name: Configure hosts
29+
shell: bash
30+
working-directory: undici/test/web-platform-tests/wpt
31+
run: python3 wpt make-hosts-file | sudo tee -a /etc/hosts
32+
- name: Install dependencies
33+
shell: bash
34+
working-directory: undici
35+
run: npm install
36+
- name: Run WPT
37+
shell: bash
38+
working-directory: undici
39+
env:
40+
CI: 'true'
41+
WPT_REPORT: ${{ github.workspace }}/undici/wptreport.json
42+
run: npm run test:wpt || true
43+
- name: Merge report
44+
shell: bash
45+
env:
46+
NODE_WPT_REPORT: ${{ inputs.wpt-report }}
47+
UNDICI_WPT_REPORT: ${{ github.workspace }}/undici/wptreport.json
48+
run: |
49+
if [ -f "$UNDICI_WPT_REPORT" ]; then
50+
jq -sc '
51+
.[0].results += .[1].results |
52+
.[0].time_end = .[1].time_end |
53+
.[0]
54+
' "$NODE_WPT_REPORT" "$UNDICI_WPT_REPORT" > "${NODE_WPT_REPORT}.tmp"
55+
mv "${NODE_WPT_REPORT}.tmp" "$NODE_WPT_REPORT"
56+
fi

‎.github/actions/undici-wpt-legacy/action.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Run undici WPT (legacy)
2+
description: Runs undici WPT tests for undici < 7 and appends results to the Node.js WPT report
3+
4+
inputs:
5+
undici-version:
6+
required: true
7+
description: undici version tag to checkout
8+
wpt-report:
9+
required: true
10+
description: Path to the Node.js WPT report
11+
12+
runs:
13+
using: composite
14+
steps:
15+
- name: Checkout undici
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
with:
18+
repository: nodejs/undici
19+
persist-credentials: false
20+
path: undici
21+
clean: false
22+
ref: ${{ inputs.undici-version }}
23+
- name: Prepare WPT checkout
24+
shell: bash
25+
run: |
26+
rm -rf undici/test/wpt/tests
27+
mv test/fixtures/wpt undici/test/wpt/tests
28+
- name: Install dependencies
29+
shell: bash
30+
working-directory: undici
31+
run: npm install
32+
- name: Run WPT
33+
shell: bash
34+
working-directory: undici
35+
env:
36+
WPT_REPORT: ${{ inputs.wpt-report }}
37+
run: npm run test:wpt || true

‎.github/dependabot.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ updates:
5252
semver-major-days: 5
5353
semver-minor-days: 5
5454
semver-patch-days: 5
55+
exclude:
56+
- '@node-core/doc-kit'
5557
commit-message:
5658
prefix: tools
5759
open-pull-requests-limit: 10

0 commit comments

Comments
 (0)