From 5527e9bfacbf9db516fcf92b7b5635dfc375335a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 26 Nov 2021 07:23:46 +0100 Subject: [PATCH] tools: update gyp-next to v0.10.1 PR-URL: https://github.com/nodejs/node/pull/40934 Reviewed-By: Richard Lau Reviewed-By: Beth Griggs Reviewed-By: Stephen Belanger Reviewed-By: Rich Trott --- tools/gyp/.github/workflows/Python_tests.yml | 2 +- tools/gyp/.github/workflows/node-gyp.yml | 2 +- tools/gyp/CHANGELOG.md | 7 +++++++ tools/gyp/pylib/gyp/generator/make.py | 2 +- 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 92303b635f2cfa..40ff521a6fd0b5 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 bd7c85ffda9169..0c26a3d7de3d0e 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 b7d55ed65551b6..57d691c1812d38 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 c595f20fe2df12..05e1f26a63d2fc 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py @@ -50,7 +50,7 @@ } # 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 cf9d7d2e56c49f..576880a7f7a9fc 100644 --- a/tools/gyp/setup.py +++ b/tools/gyp/setup.py @@ -15,7 +15,7 @@ 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",