Skip to content

Commit 504250e

Browse files
feat: update gyp-next to v0.19.1 (#3122)
1 parent 2530f51 commit 504250e

28 files changed

+270
-203
lines changed

gyp/.github/workflows/node-gyp.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
name: node-gyp integration
22
on:
33
push:
4-
branches: [ main ]
54
pull_request:
6-
branches: [ main ]
75
workflow_dispatch:
6+
87
jobs:
9-
integration:
8+
node-gyp-integration:
109
strategy:
1110
fail-fast: false
1211
matrix:

gyp/.github/workflows/nodejs-windows.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

gyp/.github/workflows/nodejs.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Node.js integration
2+
on:
3+
push:
4+
pull_request:
5+
workflow_dispatch:
6+
7+
jobs:
8+
nodejs-integration:
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
13+
python: ["3.8", "3.10", "3.12", "3.13"]
14+
15+
runs-on: ${{ matrix.os }}
16+
steps:
17+
- name: Clone gyp-next
18+
uses: actions/checkout@v4
19+
with:
20+
path: gyp-next
21+
- name: Clone nodejs/node
22+
uses: actions/checkout@v4
23+
with:
24+
repository: nodejs/node
25+
path: node
26+
- uses: actions/setup-python@v5
27+
with:
28+
python-version: ${{ matrix.python }}
29+
allow-prereleases: true
30+
- name: Replace gyp in Node.js
31+
shell: bash
32+
run: |
33+
rm -rf node/tools/gyp
34+
cp -r gyp-next node/tools/gyp
35+
36+
# macOS and Linux
37+
- name: Run configure
38+
if: runner.os != 'Windows'
39+
run: |
40+
cd node
41+
./configure
42+
43+
# Windows
44+
- name: Install deps
45+
if: runner.os == 'Windows'
46+
run: choco install nasm
47+
- name: Run configure
48+
if: runner.os == 'Windows'
49+
run: |
50+
cd node
51+
./vcbuild.bat nobuild

gyp/.github/workflows/Python_tests.yml renamed to gyp/.github/workflows/python_tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
name: Python_tests
55
on:
66
push:
7-
branches: [ main ]
87
pull_request:
9-
branches: [ main ]
108
workflow_dispatch:
9+
1110
jobs:
1211
Python_tests:
1312
runs-on: ${{ matrix.os }}
@@ -24,14 +23,14 @@ jobs:
2423
with:
2524
python-version: ${{ matrix.python-version }}
2625
allow-prereleases: true
27-
- uses: seanmiddleditch/gha-setup-ninja@v4
26+
- uses: seanmiddleditch/gha-setup-ninja@v5
2827
- name: Install dependencies
2928
run: |
3029
python -m pip install --upgrade pip setuptools
3130
pip install --editable ".[dev]"
3231
- run: ./gyp -V && ./gyp --version && gyp -V && gyp --version
3332
- name: Lint with ruff # See pyproject.toml for settings
34-
run: ruff --output-format=github .
33+
run: ruff check --output-format=github .
3534
- name: Test with pytest # See pyproject.toml for settings
3635
run: pytest
3736
# - name: Run doctests with pytest

gyp/.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
name: python-package-distributions
8181
path: dist/
8282
- name: Sign the dists with Sigstore
83-
uses: sigstore/gh-action-sigstore-python@v2.1.1
83+
uses: sigstore/gh-action-sigstore-python@v3.0.0
8484
with:
8585
inputs: >-
8686
./dist/*.tar.gz

gyp/.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "0.18.1"
2+
".": "0.19.1"
33
}

gyp/CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
11
# Changelog
22

3+
## [0.19.1](https://github.com/nodejs/gyp-next/compare/v0.19.0...v0.19.1) (2024-12-09)
4+
5+
6+
### Bug Fixes
7+
8+
* fixup for break in EscapeForCString ([#274](https://github.com/nodejs/gyp-next/issues/274)) ([610f661](https://github.com/nodejs/gyp-next/commit/610f661da877a358c8b3cbc106b528fb1d0b8095))
9+
10+
## [0.19.0](https://github.com/nodejs/gyp-next/compare/v0.18.3...v0.19.0) (2024-12-03)
11+
12+
13+
### Features
14+
15+
* provide escaped version of `PRODUCT_DIR_ABS` ([#271](https://github.com/nodejs/gyp-next/issues/271)) ([3bf3b1c](https://github.com/nodejs/gyp-next/commit/3bf3b1cda26f16c645e0fdd5582ffbf49d9a2580))
16+
17+
## [0.18.3](https://github.com/nodejs/gyp-next/compare/v0.18.2...v0.18.3) (2024-10-08)
18+
19+
20+
### Bug Fixes
21+
22+
* enable pch for clang on windows ([#268](https://github.com/nodejs/gyp-next/issues/268)) ([cc5838c](https://github.com/nodejs/gyp-next/commit/cc5838c4e9260bf459d71de53fbb2eebd1a6f508))
23+
24+
## [0.18.2](https://github.com/nodejs/gyp-next/compare/v0.18.1...v0.18.2) (2024-09-23)
25+
26+
27+
### Bug Fixes
28+
29+
* do not assume that /usr/bin/env exists on macOS ([#216](https://github.com/nodejs/gyp-next/issues/216)) ([706d04a](https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466))
30+
* fix E721 lint errors ([#206](https://github.com/nodejs/gyp-next/issues/206)) ([d1299a4](https://github.com/nodejs/gyp-next/commit/d1299a49d313eccabecf97ccb56fc033afad39ad))
31+
332
## [0.18.1](https://github.com/nodejs/gyp-next/compare/v0.18.0...v0.18.1) (2024-05-26)
433

534

gyp/docs/Hacking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ See [Testing](Testing.md) for more details on the test framework.
3434
Note that it can be handy to look at the project files output by the tests
3535
to diagnose problems. The easiest way to do that is by kindly asking the
3636
test driver to leave the temporary directories it creates in-place.
37-
This is done by setting the enviroment variable "PRESERVE", e.g.
37+
This is done by setting the environment variable "PRESERVE", e.g.
3838

3939
```
4040
set PRESERVE=all # On Windows

gyp/docs/LanguageSpecification.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ have structural meaning for target definitions:
157157
| `all_dependent_settings` | A dictionary of settings to be applied to all dependents of the target, transitively. This includes direct dependents and the entire set of their dependents, and so on. This section may contain anything found within a `target` dictionary, except `configurations`, `target_name`, and `type` sections. Compare `direct_dependent_settings` and `link_settings`. |
158158
| `configurations` | A list of dictionaries defining build configurations for the target. See the "Configurations" section below. |
159159
| `copies` | A list of copy actions to perform. See the "Copies" section below. |
160-
| `defines` | A list of preprocesor definitions to be passed on the command line to the C/C++ compiler (via `-D` or `/D` options). |
160+
| `defines` | A list of preprocessor definitions to be passed on the command line to the C/C++ compiler (via `-D` or `/D` options). |
161161
| `dependencies` | A list of targets on which this target depends. Targets in other `.gyp` files are specified as `../path/to/other.gyp:target_we_want`. |
162162
| `direct_dependent_settings` | A dictionary of settings to be applied to other targets that depend on this target. These settings will only be applied to direct dependents. This section may contain anything found within a `target` dictionary, except `configurations`, `target_name`, and `type` sections. Compare with `all_dependent_settings` and `link_settings`. |
163163
| `include_dirs` | A list of include directories to be passed on the command line to the C/C++ compiler (via `-I` or `/I` options). |
@@ -208,8 +208,8 @@ Configuration dictionaries may also contain these elements:
208208

209209
Conditionals may appear within any dictionary in a `.gyp` file. There
210210
are two tpes of conditionals, which differ only in the timing of their
211-
processing. `conditons` sections are processed shortly after loading
212-
`.gyp` files, and `target_conditons` sections are processed after all
211+
processing. `conditions` sections are processed shortly after loading
212+
`.gyp` files, and `target_conditions` sections are processed after all
213213
dependencies have been computed.
214214

215215
A conditional section is introduced with a `conditions` or

gyp/docs/Testing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,15 @@ fails the test if it does.
392392

393393
Verifies that the output string contains all of the "lines" in the specified
394394
list of lines. In practice, the lines can be any substring and need not be
395-
`\n`-terminaed lines per se. If any line is missing, the test fails.
395+
`\n`-terminated lines per se. If any line is missing, the test fails.
396396

397397
```
398398
test.must_not_contain_any_lines(output, lines)
399399
```
400400

401401
Verifies that the output string does _not_ contain any of the "lines" in the
402402
specified list of lines. In practice, the lines can be any substring and need
403-
not be `\n`-terminaed lines per se. If any line exists in the output string,
403+
not be `\n`-terminated lines per se. If any line exists in the output string,
404404
the test fails.
405405

406406
```
@@ -409,7 +409,7 @@ the test fails.
409409

410410
Verifies that the output string contains at least one of the "lines" in the
411411
specified list of lines. In practice, the lines can be any substring and need
412-
not be `\n`-terminaed lines per se. If none of the specified lines is present,
412+
not be `\n`-terminated lines per se. If none of the specified lines is present,
413413
the test fails.
414414

415415
### Reading file contents

0 commit comments

Comments
 (0)