Skip to content

Commit b82a398

Browse files
committed
Merge branch 'main' into network_family_autoselection_attempt_timeout_500
2 parents f527634 + 532fff6 commit b82a398

File tree

491 files changed

+15458
-13872
lines changed

Some content is hidden

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

491 files changed

+15458
-13872
lines changed

.github/workflows/create-release-proposal.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,10 @@ jobs:
7171
git config --local user.name "Node.js GitHub Bot"
7272
7373
- name: Start git node release prepare
74-
# `git update-index` tells git to ignore future changes to the `.sh` file,
75-
# `|| true` is there to ignore the error if such file doesn't exist yet.
7674
# The curl command is to make sure we run the version of the script corresponding to the current workflow.
7775
run: |
78-
git update-index --assume-unchanged tools/actions/create-release-proposal.sh || true
79-
curl -fsSLo tools/actions/create-release-proposal.sh https://github.com/${GITHUB_REPOSITORY}/raw/${GITHUB_SHA}/tools/actions/create-release-proposal.sh
80-
./tools/actions/create-release-proposal.sh "${RELEASE_DATE}" "${RELEASE_LINE}" "${GITHUB_ACTOR}"
76+
curl -fsSL https://github.com/${GITHUB_REPOSITORY}/raw/${GITHUB_SHA}/tools/actions/create-release-proposal.sh |\
77+
sh -s -- "${RELEASE_DATE}" "${RELEASE_LINE}" "${GITHUB_ACTOR}"
8178
env:
8279
GH_TOKEN: ${{ github.token }}
8380
# We want the bot to push the push the release commit so CI runs on it.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2098,7 +2098,7 @@ The externally maintained libraries used by Node.js are:
20982098
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
20992099
"""
21002100

2101-
- inspector_protocol, located at tools/inspector_protocol, is licensed as follows:
2101+
- inspector_protocol, located at deps/inspector_protocol, is licensed as follows:
21022102
"""
21032103
// Copyright 2016 The Chromium Authors. All rights reserved.
21042104
//

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,6 @@ For information about the governance of the Node.js project, see
197197

198198
#### TSC regular members
199199

200-
* [apapirovski](https://github.com/apapirovski) -
201-
**Anatoli Papirovski** <<[email protected]>> (he/him)
202200
* [BethGriggs](https://github.com/BethGriggs) -
203201
**Beth Griggs** <<[email protected]>> (she/her)
204202
* [bnoordhuis](https://github.com/bnoordhuis) -
@@ -222,6 +220,8 @@ For information about the governance of the Node.js project, see
222220

223221
* [addaleax](https://github.com/addaleax) -
224222
**Anna Henningsen** <<[email protected]>> (she/her)
223+
* [apapirovski](https://github.com/apapirovski) -
224+
**Anatoli Papirovski** <<[email protected]>> (he/him)
225225
* [ChALkeR](https://github.com/ChALkeR) -
226226
**Сковорода Никита Андреевич** <<[email protected]>> (he/him)
227227
* [chrisdickinson](https://github.com/chrisdickinson) -
@@ -291,8 +291,6 @@ For information about the governance of the Node.js project, see
291291
**Antoine du Hamel** <<[email protected]>> (he/him) - [Support me](https://github.com/sponsors/aduh95)
292292
* [anonrig](https://github.com/anonrig) -
293293
**Yagiz Nizipli** <<[email protected]>> (he/him) - [Support me](https://github.com/sponsors/anonrig)
294-
* [apapirovski](https://github.com/apapirovski) -
295-
**Anatoli Papirovski** <<[email protected]>> (he/him)
296294
* [atlowChemi](https://github.com/atlowChemi) -
297295
**Chemi Atlow** <<[email protected]>> (he/him)
298296
* [Ayase-252](https://github.com/Ayase-252) -
@@ -475,6 +473,8 @@ For information about the governance of the Node.js project, see
475473
**Anna M. Kedzierska** <<[email protected]>>
476474
* [antsmartian](https://github.com/antsmartian) -
477475
**Anto Aravinth** <<[email protected]>> (he/him)
476+
* [apapirovski](https://github.com/apapirovski) -
477+
**Anatoli Papirovski** <<[email protected]>> (he/him)
478478
* [aqrln](https://github.com/aqrln) -
479479
**Alexey Orlenko** <<[email protected]>> (he/him)
480480
* [AshCripps](https://github.com/AshCripps) -

android-configure

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ command -v python3.12 >/dev/null && exec python3.12 "$0" "$@"
99
command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
1010
command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
1111
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
12-
command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
1312
command -v python3 >/dev/null && exec python3 "$0" "$@"
1413
exec python "$0" "$@"
1514
''' "$0" "$@"
@@ -23,7 +22,7 @@ except ImportError:
2322
from distutils.spawn import find_executable as which
2423

2524
print('Node.js android configure: Found Python {}.{}.{}...'.format(*sys.version_info))
26-
acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9), (3, 8))
25+
acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9))
2726
if sys.version_info[:2] in acceptable_pythons:
2827
import android_configure
2928
else:

configure

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ command -v python3.12 >/dev/null && exec python3.12 "$0" "$@"
99
command -v python3.11 >/dev/null && exec python3.11 "$0" "$@"
1010
command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
1111
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
12-
command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
1312
command -v python3 >/dev/null && exec python3 "$0" "$@"
1413
exec python "$0" "$@"
1514
''' "$0" "$@"
@@ -23,7 +22,7 @@ except ImportError:
2322
from distutils.spawn import find_executable as which
2423

2524
print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info))
26-
acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9), (3, 8))
25+
acceptable_pythons = ((3, 13), (3, 12), (3, 11), (3, 10), (3, 9))
2726
if sys.version_info[:2] in acceptable_pythons:
2827
import configure
2928
else:

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2143,7 +2143,7 @@ def make_bin_override():
21432143
if sys.platform == 'win32':
21442144
raise Exception('make_bin_override should not be called on win32.')
21452145
# If the system python is not the python we are running (which should be
2146-
# python 3.8+), then create a directory with a symlink called `python` to our
2146+
# python 3.9+), then create a directory with a symlink called `python` to our
21472147
# sys.executable. This directory will be prefixed to the PATH, so that
21482148
# other tools that shell out to `python` will use the appropriate python
21492149

File renamed without changes.
File renamed without changes.

deps/inspector_protocol/README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Chromium inspector (devtools) protocol
2+
3+
This package contains code generators and templates for the Chromium
4+
inspector protocol.
5+
6+
The canonical location of this package is at
7+
https://chromium.googlesource.com/deps/inspector_protocol/
8+
9+
In the Chromium tree, it's rolled into
10+
https://cs.chromium.org/chromium/src/third_party/inspector_protocol/
11+
12+
In the V8 tree, it's rolled into
13+
https://cs.chromium.org/chromium/src/v8/third_party/inspector_protocol/
14+
15+
See also [Contributing to Chrome Devtools Protocol](https://docs.google.com/document/d/1c-COD2kaK__5iMM5SEx-PzNA7HFmgttcYfOHHX0HaOM/edit).
16+
17+
To build and run the tests of the crdtp library, see
18+
[CRDTP - Chrome DevTools Protocol](crdtp/README.md).

tools/inspector_protocol/README.node renamed to deps/inspector_protocol/README.node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Name: inspector protocol
22
Short Name: inspector_protocol
33
URL: https://chromium.googlesource.com/deps/inspector_protocol/
44
Version: 0
5-
Revision: 0aafd2876f7485db7b07c513c0457b7cbbbe3304
5+
Revision: 64cc2301620c04f0fe0313ae94a9319f003603cf
66
License: BSD
77
License File: LICENSE
88
Security Critical: no

tools/inspector_protocol/check_protocol_compatibility.py renamed to deps/inspector_protocol/check_protocol_compatibility.py

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,7 @@
1-
#!/usr/bin/env python
2-
# Copyright (c) 2011 Google Inc. All rights reserved.
3-
#
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions are
6-
# met:
7-
#
8-
# * Redistributions of source code must retain the above copyright
9-
# notice, this list of conditions and the following disclaimer.
10-
# * Redistributions in binary form must reproduce the above
11-
# copyright notice, this list of conditions and the following disclaimer
12-
# in the documentation and/or other materials provided with the
13-
# distribution.
14-
# * Neither the name of Google Inc. nor the names of its
15-
# contributors may be used to endorse or promote products derived from
16-
# this software without specific prior written permission.
17-
#
18-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19-
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20-
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21-
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22-
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23-
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24-
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25-
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26-
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27-
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28-
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1+
#!/usr/bin/env python3
2+
# Copyright 2011 The Chromium Authors
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
295
#
306
# Inspector protocol validator.
317
#

0 commit comments

Comments
 (0)