diff options
| author | Michaël Zasso <targos@protonmail.com> | 2021-11-26 07:23:46 +0100 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2021-11-26 15:36:37 +0100 |
| commit | 747247bc5923dca70a4e01efe28945ee07fe8af3 (patch) | |
| tree | 55e42932b2eb98750f39b147c09b1952f0f093c0 | |
| parent | 130777a61c05791f17e3220e25c114d980582d63 (diff) | |
| download | node-new-747247bc5923dca70a4e01efe28945ee07fe8af3.tar.gz | |
tools: update gyp-next to v0.10.1
PR-URL: https://github.com/nodejs/node/pull/40934
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Beth Griggs <bgriggs@redhat.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
| -rw-r--r-- | tools/gyp/.github/workflows/Python_tests.yml | 2 | ||||
| -rw-r--r-- | tools/gyp/.github/workflows/node-gyp.yml | 2 | ||||
| -rw-r--r-- | tools/gyp/CHANGELOG.md | 7 | ||||
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/make.py | 2 | ||||
| -rw-r--r-- | tools/gyp/setup.py | 2 |
5 files changed, 11 insertions, 4 deletions
diff --git a/tools/gyp/.github/workflows/Python_tests.yml b/tools/gyp/.github/workflows/Python_tests.yml index 92303b635f..40ff521a6f 100644 --- a/tools/gyp/.github/workflows/Python_tests.yml +++ b/tools/gyp/.github/workflows/Python_tests.yml @@ -11,7 +11,7 @@ jobs: max-parallel: 8 matrix: os: [macos-latest, ubuntu-latest] # , windows-latest] - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} diff --git a/tools/gyp/.github/workflows/node-gyp.yml b/tools/gyp/.github/workflows/node-gyp.yml index bd7c85ffda..0c26a3d7de 100644 --- a/tools/gyp/.github/workflows/node-gyp.yml +++ b/tools/gyp/.github/workflows/node-gyp.yml @@ -8,7 +8,7 @@ jobs: fail-fast: false matrix: os: [macos-latest, ubuntu-latest, windows-latest] - python: [3.6, 3.9] + python: ["3.6", "3.10"] runs-on: ${{ matrix.os }} steps: diff --git a/tools/gyp/CHANGELOG.md b/tools/gyp/CHANGELOG.md index b7d55ed655..57d691c181 100644 --- a/tools/gyp/CHANGELOG.md +++ b/tools/gyp/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.10.1](https://www.github.com/nodejs/gyp-next/compare/v0.10.0...v0.10.1) (2021-11-24) + + +### Bug Fixes + +* **make:** only generate makefile for multiple toolsets if requested ([#133](https://www.github.com/nodejs/gyp-next/issues/133)) ([f463a77](https://www.github.com/nodejs/gyp-next/commit/f463a77705973289ea38fec1b244c922ac438e26)) + ## [0.10.0](https://www.github.com/nodejs/gyp-next/compare/v0.9.6...v0.10.0) (2021-08-26) diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py index 4ea71ca9ac..b15b1b8332 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py @@ -50,7 +50,7 @@ generator_default_variables = { } # Make supports multiple toolsets -generator_supports_multiple_toolsets = True +generator_supports_multiple_toolsets = gyp.common.CrossCompileRequested() # Request sorted dependencies in the order from dependents to dependencies. generator_wants_sorted_dependencies = False diff --git a/tools/gyp/setup.py b/tools/gyp/setup.py index cf9d7d2e56..576880a7f7 100644 --- a/tools/gyp/setup.py +++ b/tools/gyp/setup.py @@ -15,7 +15,7 @@ with open(path.join(here, "README.md")) as in_file: setup( name="gyp-next", - version="0.10.0", + version="0.10.1", description="A fork of the GYP build system for use in the Node.js projects", long_description=long_description, long_description_content_type="text/markdown", |