git-node: add release promotion step #402

codebytere · 2020-04-09T05:42:59Z

Refs #388.

Some of this hard to test, since it involved taking real steps that we take during releases.

I've chosen to seek active confirmation more here than in the prep stage, since many of the steps are irreversible, but I'm open to any and all thoughts about how much we might want.

This adds the secondary portion of release automation, for the promotion step. Specifically, we want to:

Verify that the release PR has green CI and an approval
Create and sign the release tag
Set up for next release
Merge the release proposal branch into the release branch
Cherry pick release commit to master
Push release tag
Promote and sign the release builds

cc @nodejs/releasers

codecov · 2020-04-09T05:53:26Z

Codecov Report

Merging #402 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #402   +/-   ##
=======================================
  Coverage   76.34%   76.34%           
=======================================
  Files          21       21           
  Lines        1484     1484           
=======================================
  Hits         1133     1133           
  Misses        351      351

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f58051c...3377b44. Read the comment docs.

targos · 2020-04-09T07:31:16Z

I'll review and try this when I do the 13.x release next week

targos · 2020-04-13T12:00:59Z

I'm trying git-node release --prepare but it runs out of memory while "Updating CHANGELOG_V13.md".

targos · 2020-04-14T17:42:30Z

Is it supposed to ask me for my GitHub credentials?
It blocks immediately at:

$ /home/mzasso/git/nodejs/node-core-utils/bin/git-node release --promote 32813 
⠋ Verifying Releaser statusIf this is your first time running this command, follow the instructions to create an access token. If you prefer to create it yourself on Github, see https://github.com/nodejs/node-core-utils/blob/master/README.md.
⠸ Verifying Releaser status

targos · 2020-04-14T17:44:12Z

Okay, I found that I can enter my username/password/otp code and it continues.
Then:

⠴ Verifying Releaser status
✔  Received member information of nodejs/releasers
✔  undefined is not a Releaser; aborting release

targos · 2020-04-14T17:49:08Z

The output of the next steps is weird:

✔  Done loading data for nodejs/node/pull/32813
... skipped some lines
   ✔  Approvals: 6
   ✔  - Matteo Collina (@mcollina) (TSC): https://github.com/nodejs/node/pull/32813#pullrequestreview-393019854
   ✔  - Colin Ihrig (@cjihrig) (TSC): https://github.com/nodejs/node/pull/32813#pullrequestreview-393040785
   ✔  - Richard Lau (@richardlau): https://github.com/nodejs/node/pull/32813#pullrequestreview-393075642
   ✔  - Shelley Vohr (@codebytere) (TSC): https://github.com/nodejs/node/pull/32813#pullrequestreview-393107238
   ✔  - Jiawen Geng (@gengjiawen): https://github.com/nodejs/node/pull/32813#pullrequestreview-393109215
   ✔  - Matheus Marchini (@mmarchini) (TSC): https://github.com/nodejs/node/pull/32813#pullrequestreview-393134711
   ✖  This PR needs to wait 19 more hours to land
✖  Jenkins CI is failing for #32813
--------------------------------------------------------------------------------
? Do you want to proceed? Yes
✔  Jenkins CI is passing
✖  GitHub CI is failing for #32813
--------------------------------------------------------------------------------
? Do you want to proceed? Yes
✔  GitHub CI is passing
✖  #32813 does not have sufficient approvals
--------------------------------------------------------------------------------
? Do you want to proceed? Yes
✔  #32813 has necessary approvals

targos · 2020-04-14T17:51:44Z

Then it crashes on the secure tag step:

? Tag and sign the release? Yes
Error: /home/mzasso/git/nodejs/node-core-utils/node_modules/git-secure-tag/lib/git-secure-tag/batch.js:83
    throw new Error(`Unexpected reply for ${object}`);
    ^

Error: Unexpected reply for 
    at Batch.getEntry (/home/mzasso/git/nodejs/node-core-utils/node_modules/git-secure-tag/lib/git-secure-tag/batch.js:83:11)
    at Batch.onMissing (/home/mzasso/git/nodejs/node-core-utils/node_modules/git-secure-tag/lib/git-secure-tag/batch.js:89:22)
    at Batch.onHeader (/home/mzasso/git/nodejs/node-core-utils/node_modules/git-secure-tag/lib/git-secure-tag/batch.js:73:10)
    at Batch.onData (/home/mzasso/git/nodejs/node-core-utils/node_modules/git-secure-tag/lib/git-secure-tag/batch.js:56:12)
    at Socket.<anonymous> (/home/mzasso/git/nodejs/node-core-utils/node_modules/git-secure-tag/lib/git-secure-tag/batch.js:17:44)
    at Socket.emit (events.js:315:20)
    at addChunk (_stream_readable.js:297:12)
    at readableAddChunk (_stream_readable.js:273:9)
    at Socket.Readable.push (_stream_readable.js:214:10)
    at Pipe.onStreamRead (internal/stream_base_commons.js:186:23)

    at exports.runSync (/home/mzasso/git/nodejs/node-core-utils/lib/run.js:60:11)
    at ReleasePromotion.secureTagRelease (/home/mzasso/git/nodejs/node-core-utils/lib/promote_release.js:246:12)
    at ReleasePromotion.promote (/home/mzasso/git/nodejs/node-core-utils/lib/promote_release.js:85:10)
    at processTicksAndRejections (internal/process/task_queues.js:97:5)

codebytere · 2020-04-14T17:52:08Z

hmm @targos - it pulls information from your local ncu configuration 🤔 i have the normal setup for myself and it finds that i'm codebytere successfully.

In re. the second issue - looks like cli doesn't handle nested spinners very well, i'll refactor.

And re. secure-tag - i added it to deps but we might need to simply require that a releaser has globally installed it instead and then execute it that way. What do you think?

lib/promote_release.js

targos · 2020-04-14T17:54:51Z

@codebytere yeah, I actually did not have my .ncurc (it doesn't work well with the npm-check-updates lib and I have to move the file when I use it). I put it back in my home directory and it worked

targos · 2020-04-14T17:56:07Z

I wonder why it said that the PR does not have sufficient approvals. It has 6 of them 🤔

targos · 2020-04-14T17:59:54Z

This is what is passed to runSync for the secure tag:

/home/mzasso/git/nodejs/node-core-utils/node_modules/.bin/git-secure-tag [
  'v13.13.0',
  '813052119e9b73411534e2c50b027781e8882e10\n',
  '-sm',
  `"'2020-04-14, Node.js v13.13.0 (Current) Release"`
]

lib/promote_release.js

targos · 2020-04-14T18:10:38Z

The branch switching doesn't work:

? Merge proposal branch into staging branch? Yes
⠋ Merging proposal branchError: Switched to branch 'v13.x'

    at exports.runSync (/home/mzasso/git/nodejs/node-core-utils/lib/run.js:60:11)
    at ReleasePromotion.mergeProposalBranch (/home/mzasso/git/nodejs/node-core-utils/lib/promote_release.js:292:5)
    at ReleasePromotion.promote (/home/mzasso/git/nodejs/node-core-utils/lib/promote_release.js:101:16)
    at processTicksAndRejections (internal/process/task_queues.js:97:5)

targos · 2020-04-14T18:13:20Z

^

That's because runSync throws child.stderr as an error if it's not empty. But git sometimes outputs its messages to stderr.
What should we do here?

lib/promote_release.js

targos · 2020-04-14T18:20:06Z

lib/promote_release.js

+    if (!didResolveConflicts) {
+      cli.warn(`Aborting release promotion for version ${version}`);
+      return;
+    }


else, we need to:

git add src/node_version.h # or ask the user to add conflicted files manually git cherry-pick --continue git push upstream master git checkout branch-staging

lib/promote_release.js

targos · 2020-04-14T18:27:02Z

The promotion step doesn't work. It stops immediately with a success message, but the promotion did not happen (note that the promotion script is interactive so we may have to run it in a special way)

lib/promote_release.js

Co-Authored-By: Michaël Zasso <[email protected]>

codebytere · 2020-05-20T18:53:37Z

@targos rebased and updated a few things if you're willing to give this another spin on your next release!

targos · 2020-05-26T13:18:40Z

I'm giving it a try now with 12.17.0

lib/promote_release.js

lundibundi · 2020-08-23T05:45:57Z

components/git/release.js

+    } else {
+      if (!releasers.some(r => r.login === release.username)) {
+        cli.stopSpinner(
+          `${release.username} is not a Releaser; aborting release`);
+        return;
+      }
+      cli.stopSpinner('Verified Releaser status');
+    }


Nit:

Suggested change

} else {

if (!releasers.some(r => r.login === release.username)) {

cli.stopSpinner(

`${release.username} is not a Releaser; aborting release`);

return;

}

cli.stopSpinner('Verified Releaser status');

}

} else if (releasers.every(r => r.login !== release.username)) {

cli.stopSpinner(

`${release.username} is not a Releaser; aborting release`);

return;

}

cli.stopSpinner('Verified Releaser status');

github-actions · 2020-11-22T00:31:48Z

This PR is stale because it has been open many days with no activity. It will be closed soon unless the stale label is removed or a comment is made.

github-actions · 2021-02-21T00:35:48Z

This PR is stale because it has been open many days with no activity. It will be closed soon unless the stale label is removed or a comment is made.

codebytere force-pushed the git-node-release-promote branch 2 times, most recently from b44d683 to 84b0a27 Compare April 9, 2020 05:52

codebytere force-pushed the git-node-release-promote branch 3 times, most recently from 0666c26 to 13191bd Compare April 9, 2020 17:44

codebytere marked this pull request as ready for review April 9, 2020 17:48

targos reviewed Apr 14, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

targos reviewed Apr 14, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

targos reviewed Apr 14, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

targos reviewed Apr 14, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

targos reviewed Apr 14, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

targos reviewed Apr 14, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

targos reviewed Apr 14, 2020

View reviewed changes

lib/promote_release.js Show resolved Hide resolved

targos reviewed Apr 14, 2020

View reviewed changes

lib/promote_release.js Show resolved Hide resolved

targos reviewed Apr 14, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

codebytere force-pushed the git-node-release-promote branch from f6eee6a to 946d16d Compare May 5, 2020 04:00

targos reviewed May 5, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

codebytere force-pushed the git-node-release-promote branch from 946d16d to d944859 Compare May 5, 2020 19:17

codebytere and others added 10 commits May 20, 2020 11:45

git-node: add release promotion step

9ee6605

Move newVersion to named arg

15c4cb0

Split out promotion verification steps

0ec3327

Fix verification spinners

a1c3ef1

Verify ncurc is set up

61dbeb7

Properly trim getCommitSha result

ea29f87

Co-Authored-By: Michaël Zasso <[email protected]>

Address some feedback

c0db1ce

Ensure synced with upstream/master

7d23d70

fix: run release script asynchronously

692c6b7

Run secureTagRelease() asynchronously

c1ab158

codebytere force-pushed the git-node-release-promote branch from d944859 to c1ab158 Compare May 20, 2020 18:52

targos reviewed May 26, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

targos reviewed May 26, 2020

View reviewed changes

lib/promote_release.js Outdated Show resolved Hide resolved

codebytere added 2 commits May 26, 2020 09:41

Run cherry-pick asynchronously

ddfe6ef

Remove unneccessary quotes

3377b44

codebytere force-pushed the git-node-release-promote branch from 0702242 to 3377b44 Compare May 26, 2020 16:41

codebytere added the Work In Progress PR's that are in progress label Jun 27, 2020

lundibundi reviewed Aug 23, 2020

View reviewed changes

github-actions bot added the stale label Nov 22, 2020

codebytere removed the stale label Nov 22, 2020

github-actions bot added the stale label Feb 21, 2021

codebytere removed the stale label Feb 21, 2021

aduh95 mentioned this pull request Jul 22, 2024

feat(git-node): add release promotion step #835

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

git-node: add release promotion step #402

git-node: add release promotion step #402

codebytere commented Apr 9, 2020 •

edited

Loading

codecov bot commented Apr 9, 2020 •

edited

Loading

targos commented Apr 9, 2020

targos commented Apr 13, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

codebytere commented Apr 14, 2020 •

edited

Loading

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos Apr 14, 2020 •

edited

Loading

targos commented Apr 14, 2020

codebytere commented May 20, 2020

targos commented May 26, 2020

lundibundi Aug 23, 2020

github-actions bot commented Nov 22, 2020

github-actions bot commented Feb 21, 2021

git-node: add release promotion step #402

Are you sure you want to change the base?

git-node: add release promotion step #402

Conversation

codebytere commented Apr 9, 2020 • edited Loading

codecov bot commented Apr 9, 2020 • edited Loading

Codecov Report

targos commented Apr 9, 2020

targos commented Apr 13, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

codebytere commented Apr 14, 2020 • edited Loading

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos commented Apr 14, 2020

targos Apr 14, 2020 • edited Loading

Choose a reason for hiding this comment

targos commented Apr 14, 2020

codebytere commented May 20, 2020

targos commented May 26, 2020

lundibundi Aug 23, 2020

Choose a reason for hiding this comment

github-actions bot commented Nov 22, 2020

github-actions bot commented Feb 21, 2021

codebytere commented Apr 9, 2020 •

edited

Loading

codecov bot commented Apr 9, 2020 •

edited

Loading

codebytere commented Apr 14, 2020 •

edited

Loading

targos Apr 14, 2020 •

edited

Loading