From 5d9df83958d3d5e6d8acad2ebabfbe5f3fd23c13 Mon Sep 17 00:00:00 2001 From: Ruy Adorno Date: Tue, 20 Oct 2020 14:28:21 -0400 Subject: [PATCH] node-gyp@7.1.2 --- node_modules/node-gyp/CHANGELOG.md | 6 ++++ node_modules/node-gyp/CONTRIBUTING.md | 34 +++++++++++++++++++ .../gyp/.github/workflows/release-please.yml | 16 +++++++++ node_modules/node-gyp/gyp/CODE_OF_CONDUCT.md | 4 +++ node_modules/node-gyp/gyp/CONTRIBUTING.md | 32 +++++++++++++++++ node_modules/node-gyp/macOS_Catalina.md | 13 +++---- node_modules/node-gyp/package.json | 2 +- package-lock.json | 11 +++--- package.json | 2 +- 9 files changed, 108 insertions(+), 12 deletions(-) create mode 100644 node_modules/node-gyp/CONTRIBUTING.md create mode 100644 node_modules/node-gyp/gyp/.github/workflows/release-please.yml create mode 100644 node_modules/node-gyp/gyp/CODE_OF_CONDUCT.md create mode 100644 node_modules/node-gyp/gyp/CONTRIBUTING.md diff --git a/node_modules/node-gyp/CHANGELOG.md b/node_modules/node-gyp/CHANGELOG.md index dd357e32f1b3e..733a4b5dd6ad3 100644 --- a/node_modules/node-gyp/CHANGELOG.md +++ b/node_modules/node-gyp/CHANGELOG.md @@ -1,3 +1,9 @@ +v7.1.2 2020-10-17 +================= + +* [[`096e3aded5`](https://github.com/nodejs/node-gyp/commit/096e3aded5)] - **gyp**: update gyp to 0.6.2 (Myles Borins) [#2241](https://github.com/nodejs/node-gyp/pull/2241) +* [[`54f97cd243`](https://github.com/nodejs/node-gyp/commit/54f97cd243)] - **doc**: add cmd to reset `xcode-select` to initial state (Valera Rozuvan) [#2235](https://github.com/nodejs/node-gyp/pull/2235) + v7.1.1 2020-10-15 ================= diff --git a/node_modules/node-gyp/CONTRIBUTING.md b/node_modules/node-gyp/CONTRIBUTING.md new file mode 100644 index 0000000000000..c1c50eab4e58b --- /dev/null +++ b/node_modules/node-gyp/CONTRIBUTING.md @@ -0,0 +1,34 @@ +# Contributing to node-gyp + +## Code of Conduct + +Please read the +[Code of Conduct](https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md) +which explains the minimum behavior expectations for node-gyp contributors. + + +## Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +* (a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +* (b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +* (c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +* (d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. diff --git a/node_modules/node-gyp/gyp/.github/workflows/release-please.yml b/node_modules/node-gyp/gyp/.github/workflows/release-please.yml new file mode 100644 index 0000000000000..a414c10e15636 --- /dev/null +++ b/node_modules/node-gyp/gyp/.github/workflows/release-please.yml @@ -0,0 +1,16 @@ +on: + push: + branches: + - master + +name: release-please +jobs: + release-please: + runs-on: ubuntu-latest + steps: + - uses: GoogleCloudPlatform/release-please-action@v2.5.6 + with: + token: ${{ secrets.GITHUB_TOKEN }} + release-type: python + package-name: gyp-next + bump-minor-pre-major: Yes diff --git a/node_modules/node-gyp/gyp/CODE_OF_CONDUCT.md b/node_modules/node-gyp/gyp/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000000..4c211405596cb --- /dev/null +++ b/node_modules/node-gyp/gyp/CODE_OF_CONDUCT.md @@ -0,0 +1,4 @@ +# Code of Conduct + +* [Node.js Code of Conduct](https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md) +* [Node.js Moderation Policy](https://github.com/nodejs/admin/blob/master/Moderation-Policy.md) diff --git a/node_modules/node-gyp/gyp/CONTRIBUTING.md b/node_modules/node-gyp/gyp/CONTRIBUTING.md new file mode 100644 index 0000000000000..f9dd574a47cd9 --- /dev/null +++ b/node_modules/node-gyp/gyp/CONTRIBUTING.md @@ -0,0 +1,32 @@ +# Contributing to gyp-next + +## Code of Conduct + +This project is bound to the [Node.js Code of Conduct](https://github.com/nodejs/admin/blob/master/CODE_OF_CONDUCT.md). + + +## Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +* (a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +* (b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +* (c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +* (d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. diff --git a/node_modules/node-gyp/macOS_Catalina.md b/node_modules/node-gyp/macOS_Catalina.md index 79bf6ff50be09..ca2fd234733dd 100644 --- a/node_modules/node-gyp/macOS_Catalina.md +++ b/node_modules/node-gyp/macOS_Catalina.md @@ -89,12 +89,13 @@ There are three ways to install the Xcode libraries `node-gyp` needs on macOS. P ### I did all that and the acid test still does not pass :-( 1. `sudo rm -rf $(xcode-select -print-path)` # Enter root password. No output is normal. 2. `sudo rm -rf /Library/Developer/CommandLineTools` # Enter root password. -2. `xcode-select --install` -3. If the [_acid test_ steps above](#The-acid-test) still does _not_ pass then... -4. `npm explore npm -g -- npm install node-gyp@latest` -5. `npm explore npm -g -- npm explore npm-lifecycle -- npm install node-gyp@latest` -6. If the _acid test_ still does _not_ pass then... -7. Add a comment to https://github.com/nodejs/node-gyp/issues/1927 so we can improve. +3. `xcode-select --reset` +4. `xcode-select --install` +5. If the [_acid test_ steps above](#The-acid-test) still does _not_ pass then... +6. `npm explore npm -g -- npm install node-gyp@latest` +7. `npm explore npm -g -- npm explore npm-lifecycle -- npm install node-gyp@latest` +8. If the _acid test_ still does _not_ pass then... +9. Add a comment to https://github.com/nodejs/node-gyp/issues/1927 so we can improve. Lessons learned from: * https://github.com/nodejs/node-gyp/issues/1779 diff --git a/node_modules/node-gyp/package.json b/node_modules/node-gyp/package.json index b50ceb42bea87..8e256f01702f0 100644 --- a/node_modules/node-gyp/package.json +++ b/node_modules/node-gyp/package.json @@ -11,7 +11,7 @@ "bindings", "gyp" ], - "version": "7.1.1", + "version": "7.1.2", "installVersion": 9, "author": "Nathan Rajlich (http://tootallnate.net)", "repository": { diff --git a/package-lock.json b/package-lock.json index 7c48085908cc0..239482f39d54b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -117,7 +117,7 @@ "mkdirp": "^1.0.4", "mkdirp-infer-owner": "^2.0.0", "ms": "^2.1.2", - "node-gyp": "^7.1.1", + "node-gyp": "^7.1.2", "nopt": "^5.0.0", "normalize-package-data": "^3.0.0", "npm-audit-report": "^2.1.4", @@ -3744,9 +3744,10 @@ "dev": true }, "node_modules/node-gyp": { - "version": "7.1.1", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", + "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", "inBundle": true, - "license": "MIT", "dependencies": { "env-paths": "^2.2.0", "glob": "^7.1.4", @@ -10589,7 +10590,9 @@ "dev": true }, "node-gyp": { - "version": "7.1.1", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", + "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", "requires": { "env-paths": "^2.2.0", "glob": "^7.1.4", diff --git a/package.json b/package.json index 04803063a6535..58dcde1f971aa 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "mkdirp": "^1.0.4", "mkdirp-infer-owner": "^2.0.0", "ms": "^2.1.2", - "node-gyp": "^7.1.1", + "node-gyp": "^7.1.2", "nopt": "^5.0.0", "normalize-package-data": "^3.0.0", "npm-audit-report": "^2.1.4",