src: fix node version #36460

richardlau · 2020-12-09T17:02:19Z

Refs: 348b7a9#r44957158
Refs: #36385

Since this is the second time this has happened in a week I'll try to figure out if there's something we can do to try to prevent this happening -- at the very least maybe make the "Revert all changes that were made to src/node_version.h." sentence an explicit step in: https://github.com/nodejs/node/blob/master/doc/guides/releases.md#13-cherry-pick-the-release-commit-to-master
But I'll do that in a separate PR so that it doesn't hold up this correction.

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

PR-URL: #36435 Notable changes: * child_processes: * add AbortSignal support (Benjamin Gruenbaum) (#36308) * deps: * update ICU to 68.1 (Michaël Zasso) (#36187) * events: * support signal in EventTarget (Benjamin Gruenbaum) (#36258) * graduate Event, EventTarget, AbortController (James M Snell) (#35949) * http: * enable call chaining with setHeader() (pooja d.p) (#35924) * module: * add isPreloading indicator (James M Snell) (#36263) * stream: * support abort signal (Benjamin Gruenbaum) (#36061) * add FileHandle support to Read/WriteStream (Momtchil Momtchev) (#35922) * worker: * add experimental BroadcastChannel (James M Snell) (#36271)

nodejs-github-bot · 2020-12-09T17:09:58Z

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

richardlau · 2020-12-09T17:33:49Z

I'd like to fast track this so that the next nightlies don't go out with the release flag set. Please 👍 this comment to approve, or comment with a reason if you do not.

MylesBorins

LGTM

github-actions · 2020-12-09T19:41:23Z

Commit Queue failed

- Loading data for nodejs/node/pull/36460
✔  Done loading data for nodejs/node/pull/36460
----------------------------------- PR info ------------------------------------
Title      src: fix node version (#36460)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     richardlau:fixversionh -> nodejs:master
Labels     fast-track
Commits    1
 - src: fix node version
Committers 1
 - Richard Lau 
PR-URL: https://github.com/nodejs/node/pull/36460
Refs: https://github.com/nodejs/node/commit/348b7a9606da61fbb5437e27f479363114ecf4eb#r44957158
Refs: https://github.com/nodejs/node/pull/36385
Reviewed-By: Beth Griggs 
Reviewed-By: Colin Ihrig 
Reviewed-By: Benjamin Gruenbaum 
Reviewed-By: Gus Caplan 
Reviewed-By: Gireesh Punathil 
Reviewed-By: Danielle Adams 
Reviewed-By: Luigi Pinca 
Reviewed-By: Myles Borins 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/36460
Refs: https://github.com/nodejs/node/commit/348b7a9606da61fbb5437e27f479363114ecf4eb#r44957158
Refs: https://github.com/nodejs/node/pull/36385
Reviewed-By: Beth Griggs 
Reviewed-By: Colin Ihrig 
Reviewed-By: Benjamin Gruenbaum 
Reviewed-By: Gus Caplan 
Reviewed-By: Gireesh Punathil 
Reviewed-By: Danielle Adams 
Reviewed-By: Luigi Pinca 
Reviewed-By: Myles Borins 
--------------------------------------------------------------------------------
   ✖  GitHub CI is still running
   ℹ  Last Full PR CI on 2020-12-09T17:09:58Z: https://ci.nodejs.org/job/node-test-pull-request/34879/
- Querying data for job/node-test-pull-request/34879/
✔  Build data downloaded
   ✔  Last Jenkins CI successful
   ℹ  This PR was created on Wed, 09 Dec 2020 17:02:19 GMT
   ✔  Approvals: 8
   ✔  - Beth Griggs (@BethGriggs) (TSC): https://github.com/nodejs/node/pull/36460#pullrequestreview-548403810
   ✔  - Colin Ihrig (@cjihrig) (TSC): https://github.com/nodejs/node/pull/36460#pullrequestreview-548405540
   ✔  - Benjamin Gruenbaum (@benjamingr): https://github.com/nodejs/node/pull/36460#pullrequestreview-548415560
   ✔  - Gus Caplan (@devsnek): https://github.com/nodejs/node/pull/36460#pullrequestreview-548434411
   ✔  - Gireesh Punathil (@gireeshpunathil) (TSC): https://github.com/nodejs/node/pull/36460#pullrequestreview-548451273
   ✔  - Danielle Adams (@danielleadams): https://github.com/nodejs/node/pull/36460#pullrequestreview-548476794
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/36460#pullrequestreview-548526875
   ✔  - Myles Borins (@MylesBorins) (TSC): https://github.com/nodejs/node/pull/36460#pullrequestreview-548542128
   ℹ  This PR is being fast-tracked
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu

https://github.com/nodejs/node/actions/runs/411415710

github-actions · 2020-12-09T22:28:31Z

Commit Queue failed

- Loading data for nodejs/node/pull/36460
✔  Done loading data for nodejs/node/pull/36460
----------------------------------- PR info ------------------------------------
Title      src: fix node version (#36460)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     richardlau:fixversionh -> nodejs:master
Labels     fast-track
Commits    1
 - src: fix node version
Committers 1
 - Richard Lau 
PR-URL: https://github.com/nodejs/node/pull/36460
Refs: https://github.com/nodejs/node/commit/348b7a9606da61fbb5437e27f479363114ecf4eb#r44957158
Refs: https://github.com/nodejs/node/pull/36385
Reviewed-By: Beth Griggs 
Reviewed-By: Colin Ihrig 
Reviewed-By: Benjamin Gruenbaum 
Reviewed-By: Gus Caplan 
Reviewed-By: Gireesh Punathil 
Reviewed-By: Danielle Adams 
Reviewed-By: Luigi Pinca 
Reviewed-By: Myles Borins 
Reviewed-By: James M Snell 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/36460
Refs: https://github.com/nodejs/node/commit/348b7a9606da61fbb5437e27f479363114ecf4eb#r44957158
Refs: https://github.com/nodejs/node/pull/36385
Reviewed-By: Beth Griggs 
Reviewed-By: Colin Ihrig 
Reviewed-By: Benjamin Gruenbaum 
Reviewed-By: Gus Caplan 
Reviewed-By: Gireesh Punathil 
Reviewed-By: Danielle Adams 
Reviewed-By: Luigi Pinca 
Reviewed-By: Myles Borins 
Reviewed-By: James M Snell 
--------------------------------------------------------------------------------
   ✖  GitHub CI is still running
   ℹ  Last Full PR CI on 2020-12-09T19:41:23Z: https://ci.nodejs.org/job/node-test-pull-request/34879/
- Querying data for job/node-test-pull-request/34879/
✔  Build data downloaded
   ✔  Last Jenkins CI successful
   ℹ  This PR was created on Wed, 09 Dec 2020 17:02:19 GMT
   ✔  Approvals: 9
   ✔  - Beth Griggs (@BethGriggs) (TSC): https://github.com/nodejs/node/pull/36460#pullrequestreview-548403810
   ✔  - Colin Ihrig (@cjihrig) (TSC): https://github.com/nodejs/node/pull/36460#pullrequestreview-548405540
   ✔  - Benjamin Gruenbaum (@benjamingr): https://github.com/nodejs/node/pull/36460#pullrequestreview-548415560
   ✔  - Gus Caplan (@devsnek): https://github.com/nodejs/node/pull/36460#pullrequestreview-548434411
   ✔  - Gireesh Punathil (@gireeshpunathil) (TSC): https://github.com/nodejs/node/pull/36460#pullrequestreview-548451273
   ✔  - Danielle Adams (@danielleadams): https://github.com/nodejs/node/pull/36460#pullrequestreview-548476794
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/36460#pullrequestreview-548526875
   ✔  - Myles Borins (@MylesBorins) (TSC): https://github.com/nodejs/node/pull/36460#pullrequestreview-548542128
   ✔  - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/36460#pullrequestreview-548650441
   ℹ  This PR is being fast-tracked
--------------------------------------------------------------------------------
   ✔  Aborted `git node land` session in /home/runner/work/node/node/.ncu

https://github.com/nodejs/node/actions/runs/411699761

mhdawson

LGTM

github-actions · 2020-12-09T23:49:19Z

Landed in a26ae70...87dc152

PR-URL: #36460 Refs: 348b7a9#r44957158 Refs: #36385 Reviewed-By: Beth Griggs <bgriggs@redhat.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Danielle Adams <adamzdanielle@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>

Add an explicit command to revert changes to `node_version.h` when cherry-picking the release commit to the `master` branch. PR-URL: #36461 Refs: #36460 Refs: #36385 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Danielle Adams <adamzdanielle@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>

src: fix node version

bfbbcff

richardlau added the request-ci Add this label to start a Jenkins CI on a PR. label Dec 9, 2020

BethGriggs approved these changes Dec 9, 2020

View reviewed changes

cjihrig approved these changes Dec 9, 2020

View reviewed changes

github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Dec 9, 2020

benjamingr approved these changes Dec 9, 2020

View reviewed changes

richardlau added the fast-track PRs that do not need to wait for 48 hours to land. label Dec 9, 2020

devsnek approved these changes Dec 9, 2020

View reviewed changes

richardlau mentioned this pull request Dec 9, 2020

doc: make explicit reverting node_version.h changes #36461

Closed

4 tasks

gireeshpunathil approved these changes Dec 9, 2020

View reviewed changes

gireeshpunathil added the commit-queue Add this label to land a pull request using GitHub Actions. label Dec 9, 2020

danielleadams approved these changes Dec 9, 2020

View reviewed changes

lpinca approved these changes Dec 9, 2020

View reviewed changes

MylesBorins approved these changes Dec 9, 2020

View reviewed changes

github-actions bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Dec 9, 2020

github-actions bot added the commit-queue-failed An error occurred while landing this pull request using GitHub Actions. label Dec 9, 2020

richardlau removed the commit-queue-failed An error occurred while landing this pull request using GitHub Actions. label Dec 9, 2020

jasnell approved these changes Dec 9, 2020

View reviewed changes

benjamingr added the commit-queue Add this label to land a pull request using GitHub Actions. label Dec 9, 2020

github-actions bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Dec 9, 2020

mhdawson approved these changes Dec 9, 2020

View reviewed changes

richardlau added commit-queue Add this label to land a pull request using GitHub Actions. and removed commit-queue-failed An error occurred while landing this pull request using GitHub Actions. labels Dec 9, 2020

github-actions bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Dec 9, 2020

github-actions bot closed this Dec 9, 2020

richardlau deleted the fixversionh branch December 10, 2020 00:12

targos added dont-land-on-v10.x labels Dec 21, 2020

BethGriggs mentioned this pull request Apr 12, 2021

2021-04-20, Version 16.0.0 (Current) #37678

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

src: fix node version #36460

src: fix node version #36460

richardlau commented Dec 9, 2020

nodejs-github-bot commented Dec 9, 2020

richardlau commented Dec 9, 2020

MylesBorins left a comment

github-actions bot commented Dec 9, 2020

github-actions bot commented Dec 9, 2020

mhdawson left a comment

github-actions bot commented Dec 9, 2020

src: fix node version #36460

src: fix node version #36460

Conversation

richardlau commented Dec 9, 2020

Checklist

nodejs-github-bot commented Dec 9, 2020

richardlau commented Dec 9, 2020

MylesBorins left a comment

Choose a reason for hiding this comment

github-actions bot commented Dec 9, 2020

github-actions bot commented Dec 9, 2020

mhdawson left a comment

Choose a reason for hiding this comment

github-actions bot commented Dec 9, 2020