From f4521ecf4449598e5a2382a2fdd5debbba38efa9 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Sat, 21 Mar 2020 19:23:15 +1100 Subject: [PATCH 1/3] doc: add note re term-size commit on top of npm Until npm updates update-notifier to a newer version, the dependency tree will contain a version of term-size that has an unsigned macOS binary. This will fail .pkg notarization and will result in failed release builds. We built and signed a term-size and contributed it back to the project for this purpose, but the dependency chain is long enough that it's not likely to be included in a new npm very quickly. Until it is, we need to cherry-pick commit d2f08a1bdb ontop of any npm updates to master and any other release branch that includes notarization. --- doc/guides/maintaining-npm.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/guides/maintaining-npm.md b/doc/guides/maintaining-npm.md index 986c202bb17a97..a2ffd0d1920565 100644 --- a/doc/guides/maintaining-npm.md +++ b/doc/guides/maintaining-npm.md @@ -74,7 +74,24 @@ Note: please ensure you are only making the updates that are changed by npm. $ git rebase --whitespace=fix master ``` -## Step 7: Test the build +## Step 7: Apply signed term-size commit + +The `term-size` package in npm's dependency tree contains an unsigned macOS +binary in versions < 2.2.0. Until npm updates to a newer version of +`update-notifier`, Node.js macOS package files can't be notarized and will fail +to install on macOS Catalina and above. + +Where an `npm ls` shows a `term-size` package version < 2.2.0, cherry-pick +commit `d2f08a1bdb` on to of the new npm. + +```console +$ git cherry-pick d2f08a1bdb +``` + +Where `npm ls` shows a `term-size` package version >= 2.2.0, edit this file to +remove this step. + +## Step 8: Test the build ```console $ make test-npm From 341550ad096219f366ff6d28ebc96215efcb0da4 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Mon, 23 Mar 2020 13:23:55 +1100 Subject: [PATCH 2/3] fixup! doc: add note re term-size commit on top of npm Co-Authored-By: Ben Noordhuis --- doc/guides/maintaining-npm.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/maintaining-npm.md b/doc/guides/maintaining-npm.md index a2ffd0d1920565..550d66cb6b184a 100644 --- a/doc/guides/maintaining-npm.md +++ b/doc/guides/maintaining-npm.md @@ -81,8 +81,8 @@ binary in versions < 2.2.0. Until npm updates to a newer version of `update-notifier`, Node.js macOS package files can't be notarized and will fail to install on macOS Catalina and above. -Where an `npm ls` shows a `term-size` package version < 2.2.0, cherry-pick -commit `d2f08a1bdb` on to of the new npm. +When `npm ls` shows a `term-size` package version < 2.2.0, cherry-pick +commit `d2f08a1bdb` on top of the upgraded npm. ```console $ git cherry-pick d2f08a1bdb From 8a12af637e2e6c58e2a561a48b7c7477905ac1ca Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Mon, 23 Mar 2020 13:24:06 +1100 Subject: [PATCH 3/3] fixup! doc: add note re term-size commit on top of npm Co-Authored-By: Ben Noordhuis --- doc/guides/maintaining-npm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/maintaining-npm.md b/doc/guides/maintaining-npm.md index 550d66cb6b184a..65a5f35b979081 100644 --- a/doc/guides/maintaining-npm.md +++ b/doc/guides/maintaining-npm.md @@ -88,7 +88,7 @@ commit `d2f08a1bdb` on top of the upgraded npm. $ git cherry-pick d2f08a1bdb ``` -Where `npm ls` shows a `term-size` package version >= 2.2.0, edit this file to +When `npm ls` shows a `term-size` package version >= 2.2.0, edit this file to remove this step. ## Step 8: Test the build