Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v12.x] backport npm updates and macOS notarization #32527

Closed
wants to merge 7 commits into from
Closed

[v12.x] backport npm updates and macOS notarization #32527

wants to merge 7 commits into from

Conversation

MylesBorins
Copy link
Member

This PR backports the updates of npm to v6.14.4 as well as the build commits to enable 10.15 notarization

@MylesBorins MylesBorins requested a review from rvagg March 28, 2020 00:19
@nodejs-github-bot nodejs-github-bot added build Issues and PRs related to build files or the CI. doc Issues and PRs related to the documentations. meta Issues and PRs related to the general management of the project. npm Issues and PRs related to the npm client dependency or the npm registry. v12.x labels Mar 28, 2020
@richardlau
Copy link
Member

nodejs/build#2203 will need to land in conjunction with this and the 10.x backport for notarization to occur.

@rvagg
Copy link
Member

rvagg commented Mar 30, 2020

#32528 (comment)

We need nodejs/build#2203 to land for this to build any releases, the codesigning command doesn't work on the older Xcode we use. I think that PR is ready to land so we should be able to get that done and then land this straight after.

rvagg
rvagg approved these changes Mar 30, 2020
View reviewed changes
Copy link
Member

@rvagg rvagg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I had a PR for this somewhere already, but it's basically this without npm so 👍.

I believe if you moved 2c02a525 (my term-size) to after the second npm update it'd probably fall out as an empty commit. But either way it should work fine. Maybe it's helpful to record that so that it would still technically compile releases without that second npm update?

@rvagg rvagg mentioned this pull request Mar 30, 2020
Closed
4 tasks
@MylesBorins
Copy link
Member Author

@rvagg I landed in that order so the commits could all land cleanly, otherwise I'd have to manually redo the npm update for 6.14.4

How are you imagining we would document that? Might make sense to fix documentation and master and backport no?

@rvagg
Copy link
Member

rvagg commented Mar 30, 2020

@MylesBorins I meant "record" in the sense of the commit record. So all's good, no objection to what's done here.
We still need to undo my changes to the npm upgrade docs on master now they're shipping the term-size binary I think but that's low priority.

@richardlau
Copy link
Member

@MylesBorins I meant "record" in the sense of the commit record. So all's good, no objection to what's done here.
We still need to undo my changes to the npm upgrade docs on master now they're shipping the term-size binary I think but that's low priority.

That was done as part of #32495.

isaacs and others added 7 commits April 1, 2020 01:48
@isaacs @MylesBorins
deps: upgrade npm to 6.14.1
11e3258 
PR-URL: nodejs#31977
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
@MylesBorins
deps: update npm to 6.14.3
949a83c 
PR-URL: nodejs#32368
Refs: nodejs#32296
Reviewed-By: Bradley Farias <bradley.meck@gmail.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@bnoordhuis @MylesBorins
deps: remove *.pyc files from deps/npm
dd4eb8b 
These seem to have accidentally slipped into the npm source tarball and
cause problems when contributors update their git checkout of node.

PR-URL: nodejs#32387
Refs: nodejs#32368
Refs: npm/cli#1037
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
@rvagg @MylesBorins
deps: update term-size with signed version
b9dc030 
PR-URL: nodejs#31459
Refs: nodejs#29216
Refs: sindresorhus/macos-terminal-size#3
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
@ruyadorno @MylesBorins
deps: upgrade npm to 6.14.4
7706dad 
PR-URL: nodejs#32495
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
@rvagg @MylesBorins
build: macOS package notarization
5c52453 
Includes hardened-runtime patch from gdams from
nodejs#29216 (comment)

PR-URL: nodejs#31459
Refs: nodejs#29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
@rvagg @MylesBorins
doc: official macOS builds now on 10.15 + Xcode 11
c5aee86 
PR-URL: nodejs#31459
Refs: nodejs#29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Apr 1, 2020 •
edited by MylesBorins

CI: https://ci.nodejs.org/job/node-test-pull-request/30313/
Rerun Linuxone: https://ci.nodejs.org/job/node-test-commit-linuxone/20000/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30344/

MylesBorins pushed a commit that referenced this pull request Apr 1, 2020
@isaacs @MylesBorins
deps: upgrade npm to 6.14.1
17217a5 
Backport-PR-URL: #32527
PR-URL: #31977
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
MylesBorins added a commit that referenced this pull request Apr 1, 2020
@MylesBorins
deps: update npm to 6.14.3
c419cd2 
Backport-PR-URL: #32527
PR-URL: #32368
Refs: #32296
Reviewed-By: Bradley Farias <bradley.meck@gmail.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
MylesBorins pushed a commit that referenced this pull request Apr 1, 2020
@bnoordhuis @MylesBorins
deps: remove *.pyc files from deps/npm
f55d071 
These seem to have accidentally slipped into the npm source tarball and
cause problems when contributors update their git checkout of node.

Backport-PR-URL: #32527
PR-URL: #32387
Refs: #32368
Refs: npm/cli#1037
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
MylesBorins pushed a commit that referenced this pull request Apr 1, 2020
@rvagg @MylesBorins
deps: update term-size with signed version
652ffa5 
Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Refs: sindresorhus/macos-terminal-size#3
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
MylesBorins pushed a commit that referenced this pull request Apr 1, 2020
@ruyadorno @MylesBorins
deps: upgrade npm to 6.14.4
6db190b 
Backport-PR-URL: #32527
PR-URL: #32495
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
MylesBorins pushed a commit that referenced this pull request Apr 1, 2020
@rvagg @MylesBorins
build: macOS package notarization
7d3910d 
Includes hardened-runtime patch from gdams from
#29216 (comment)

Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
MylesBorins pushed a commit that referenced this pull request Apr 1, 2020
@rvagg @MylesBorins
doc: official macOS builds now on 10.15 + Xcode 11
885c88e 
Backport-PR-URL: #32527
PR-URL: #31459
Refs: #29216
Reviewed-By: Christian Clauss <cclauss@me.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Signed-off-by: Rod Vagg <rod@vagg.org>
@MylesBorins
Copy link
Member Author

landed in fbd5be6...885c88e

Ignoring the linuxone failure as it is infrastructure related and we need to test the notarization stuff

@MylesBorins MylesBorins closed this Apr 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rvagg rvagg rvagg approved these changes

Assignees
No one assigned
Labels
build Issues and PRs related to build files or the CI. doc Issues and PRs related to the documentations. meta Issues and PRs related to the general management of the project. npm Issues and PRs related to the npm client dependency or the npm registry.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@MylesBorins @richardlau @rvagg @nodejs-github-bot @isaacs @bnoordhuis @ruyadorno