Skip to content

Commit d4f75da

Browse files
committed
Merge branch 'main' into mert/create-logger-api/node-core
Signed-off-by: Mert Can Altin <mertgold60@gmail.com>
2 parents b686bee + 75c1982 commit d4f75da

4,771 files changed

Lines changed: 372296 additions & 190787 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
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Build Node.js (shared libraries)
2+
description: >
3+
Downloads the slim tarball built by the `build-tarball` job, extracts it,
4+
installs Nix (+ cachix + sccache), then builds Node.js and runs the CI
5+
test suite inside the pinned nix-shell.
6+
7+
inputs:
8+
extra-nix-flags:
9+
description: Additional CLI arguments appended to the nix-shell invocation.
10+
required: false
11+
default: ''
12+
cachix-auth-token:
13+
description: Cachix auth token for nodejs.cachix.org.
14+
required: false
15+
default: ''
16+
17+
runs:
18+
using: composite
19+
steps:
20+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
21+
with:
22+
name: tarballs
23+
path: tarballs
24+
25+
- name: Extract tarball
26+
shell: bash
27+
run: |
28+
tar xzf tarballs/*.tar.gz -C "$RUNNER_TEMP"
29+
echo "TAR_DIR=$RUNNER_TEMP/$(basename tarballs/*.tar.gz .tar.gz)" >> "$GITHUB_ENV"
30+
31+
- uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
32+
with:
33+
extra_nix_config: sandbox = true
34+
35+
- uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
36+
with:
37+
name: nodejs
38+
authToken: ${{ inputs.cachix-auth-token }}
39+
40+
- name: Configure sccache
41+
if: github.base_ref == 'main' || github.ref_name == 'main'
42+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
43+
with:
44+
script: |
45+
core.exportVariable('SCCACHE_GHA_ENABLED', 'on');
46+
core.exportVariable('ACTIONS_CACHE_SERVICE_V2', 'on');
47+
core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
48+
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
49+
core.exportVariable('NIX_SCCACHE', '(import <nixpkgs> {}).sccache');
50+
51+
- name: Build Node.js and run tests
52+
shell: bash
53+
run: |
54+
nix-shell \
55+
-I "nixpkgs=$TAR_DIR/tools/nix/pkgs.nix" \
56+
--pure --keep TAR_DIR --keep FLAKY_TESTS \
57+
--keep SCCACHE_GHA_ENABLED --keep ACTIONS_CACHE_SERVICE_V2 --keep ACTIONS_RESULTS_URL --keep ACTIONS_RUNTIME_TOKEN \
58+
--arg loadJSBuiltinsDynamically false \
59+
--arg ccache "${NIX_SCCACHE:-null}" \
60+
--arg devTools '[]' \
61+
--arg benchmarkTools '[]' \
62+
${{ inputs.extra-nix-flags }} \
63+
--run '
64+
make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
65+
' "$TAR_DIR/shell.nix"

.github/workflows/auto-start-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-slim
4747
steps:
4848
- name: Install Node.js
49-
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
49+
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
5050
with:
5151
node-version: ${{ env.NODE_VERSION }}
5252

.github/workflows/build-tarball.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
export COMMIT=$(git rev-parse --short=10 "$GITHUB_SHA")
9292
./configure && make tar -j4 SKIP_XZ=1
9393
- name: Upload tarball artifact
94-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
94+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
9595
with:
9696
name: tarballs
9797
path: '*.tar.gz'
@@ -121,7 +121,7 @@ jobs:
121121
allow-prereleases: true
122122
- name: Set up sccache
123123
if: github.base_ref == 'main' || github.ref_name == 'main'
124-
uses: Mozilla-Actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9
124+
uses: Mozilla-Actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10
125125
with:
126126
version: v0.12.0
127127
- name: Environment Information

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727

2828
# Initializes the CodeQL tools for scanning.
2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
30+
uses: github/codeql-action/init@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
3131
with:
3232
languages: ${{ matrix.language }}
3333
config-file: ./.github/codeql-config.yml
3434

3535
- name: Autobuild
36-
uses: github/codeql-action/autobuild@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
36+
uses: github/codeql-action/autobuild@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
3737

3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
39+
uses: github/codeql-action/analyze@e46ed2cbd01164d986452f91f178727624ae40d7 # v4.35.3
4040
with:
4141
category: /language:${{matrix.language}}

0 commit comments

Comments
 (0)