From 7f788573b35b9f8f1fc1039b47e6f49e5644eba3 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Thu, 15 Oct 2020 20:13:01 -0400 Subject: [PATCH 1/4] Revert "test: mark test-webcrypto-encrypt-decrypt-aes flaky" This reverts commit 3d21792f8624d3f8d406700b5a661d7ef9e86f84. PR-URL: https://github.com/nodejs/node/pull/35666 Reviewed-By: Rich Trott Reviewed-By: Daijiro Wachi Reviewed-By: Richard Lau Reviewed-By: Luigi Pinca --- test/parallel/parallel.status | 1 - 1 file changed, 1 deletion(-) diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status index 2805b135d55951..811fb9a9c6f985 100644 --- a/test/parallel/parallel.status +++ b/test/parallel/parallel.status @@ -27,7 +27,6 @@ test-worker-memory: PASS,FLAKY test-worker-message-port-transfer-terminate: PASS,FLAKY [$system==linux] -test-webcrypto-encrypt-decrypt-aes: PASS,FLAKY [$system==macos] From 90a5d59824c5c9bcf2a0fb142324b2c00dde400e Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 22 Oct 2020 10:36:14 -0400 Subject: [PATCH 2/4] doc: fix Node.js 14.x changelogs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the table headings for Node.js 13.x that were not removed in 631dd21709. Vertically align the list of releases in the 14.x changelog as they are in the changelogs for 12.x and 10.x. PR-URL: https://github.com/nodejs/node/pull/35756 Reviewed-By: Antoine du Hamel Reviewed-By: Beth Griggs Reviewed-By: Shelley Vohr Reviewed-By: Myles Borins Reviewed-By: Michaël Zasso --- CHANGELOG.md | 3 +-- doc/changelogs/CHANGELOG_V14.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6de6a6b7bcd12e..2d494d4b05e4aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ Select a Node.js version below to view the changelog history: * [Node.js 14](doc/changelogs/CHANGELOG_V14.md) **Current** -* [Node.js 13](doc/changelogs/CHANGELOG_V13.md) **Current** +* [Node.js 13](doc/changelogs/CHANGELOG_V13.md) End-of-Life * [Node.js 12](doc/changelogs/CHANGELOG_V12.md) **Long Term Support** * [Node.js 11](doc/changelogs/CHANGELOG_V11.md) End-of-Life * [Node.js 10](doc/changelogs/CHANGELOG_V10.md) Long Term Support @@ -25,7 +25,6 @@ release. - diff --git a/doc/changelogs/CHANGELOG_V14.md b/doc/changelogs/CHANGELOG_V14.md index b01680c3801114..bd656a7f1b1d4c 100644 --- a/doc/changelogs/CHANGELOG_V14.md +++ b/doc/changelogs/CHANGELOG_V14.md @@ -9,7 +9,7 @@ -
14Current13Current 12LTS 10LTS
Current
+ 14.14.0
14.13.0
14.12.0
From 5b7a08c9026a88e859fb0ee6efae1cdb502d1c4e Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 23 Oct 2020 23:53:41 +0200 Subject: [PATCH 3/4] doc: add missing link in Node.js 14 Changelog Refs: https://github.com/nodejs/node/pull/35525 PR-URL: https://github.com/nodejs/node/pull/35782 Reviewed-By: Richard Lau Reviewed-By: Rich Trott Reviewed-By: Gireesh Punathil --- doc/changelogs/CHANGELOG_V14.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelogs/CHANGELOG_V14.md b/doc/changelogs/CHANGELOG_V14.md index bd656a7f1b1d4c..750288a29704a0 100644 --- a/doc/changelogs/CHANGELOG_V14.md +++ b/doc/changelogs/CHANGELOG_V14.md @@ -11,6 +11,7 @@
14.14.0
+14.13.1
14.13.0
14.12.0
14.11.0
From c1da528bc25c9cc5a8240a7b4f136f5968f6e113 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Mon, 26 Oct 2020 06:34:13 -0400 Subject: [PATCH 4/4] 2020-10-27, Version 14.15.0 'Fermium' (LTS) Notable changes: This release marks the transition of Node.js 14.x into Long Term Support (LTS) with the codename 'Fermium'. The 14.x release line now moves into "Active LTS" and will remain so until October 2021. After that time, it will move into "Maintenance" until end of life in April 2023. PR-URL: https://github.com/nodejs/node/pull/35746 --- CHANGELOG.md | 9 +++++---- doc/changelogs/CHANGELOG_V14.md | 20 ++++++++++++++++++++ src/node_version.h | 10 +++++----- test/parallel/test-process-release.js | 2 ++ 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d494d4b05e4aa..73b0ddbb0a82b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,9 @@ Select a Node.js version below to view the changelog history: -* [Node.js 14](doc/changelogs/CHANGELOG_V14.md) **Current** +* [Node.js 14](doc/changelogs/CHANGELOG_V14.md) **Long Term Support** * [Node.js 13](doc/changelogs/CHANGELOG_V13.md) End-of-Life -* [Node.js 12](doc/changelogs/CHANGELOG_V12.md) **Long Term Support** +* [Node.js 12](doc/changelogs/CHANGELOG_V12.md) Long Term Support * [Node.js 11](doc/changelogs/CHANGELOG_V11.md) End-of-Life * [Node.js 10](doc/changelogs/CHANGELOG_V10.md) Long Term Support * [Node.js 9](doc/changelogs/CHANGELOG_V9.md) End-of-Life @@ -24,13 +24,14 @@ release. - +
14Current14LTS 12LTS 10LTS
-14.14.0
+14.15.0
+14.14.0
14.13.1
14.13.0
14.12.0
diff --git a/doc/changelogs/CHANGELOG_V14.md b/doc/changelogs/CHANGELOG_V14.md index 750288a29704a0..b898d85a3dac29 100644 --- a/doc/changelogs/CHANGELOG_V14.md +++ b/doc/changelogs/CHANGELOG_V14.md @@ -6,10 +6,14 @@ + +
LTS 'Fermium' Current
+14.15.0
+		 14.14.0
14.13.1
14.13.0
@@ -47,6 +51,22 @@ * [io.js](CHANGELOG_IOJS.md) * [Archive](CHANGELOG_ARCHIVE.md) + +## 2020-10-27, Version 14.15.0 'Fermium' (LTS), @richardlau + +### Notable Changes + +This release marks the transition of Node.js 14.x into Long Term Support (LTS) +with the codename 'Fermium'. The 14.x release line now moves into "Active LTS" +and will remain so until October 2021. After that time, it will move into +"Maintenance" until end of life in April 2023. + +### Commits + +* [[`5b7a08c902`](https://github.com/nodejs/node/commit/5b7a08c902)] - **doc**: add missing link in Node.js 14 Changelog (Antoine du Hamel) [#35782](https://github.com/nodejs/node/pull/35782) +* [[`90a5d59824`](https://github.com/nodejs/node/commit/90a5d59824)] - **doc**: fix Node.js 14.x changelogs (Richard Lau) [#35756](https://github.com/nodejs/node/pull/35756) +* [[`7f788573b3`](https://github.com/nodejs/node/commit/7f788573b3)] - ***Revert*** "**test**: mark test-webcrypto-encrypt-decrypt-aes flaky" (Myles Borins) [#35666](https://github.com/nodejs/node/pull/35666) + ## 2020-10-15, Version 14.14.0 (Current), @MylesBorins diff --git a/src/node_version.h b/src/node_version.h index 29b79708ecc4e2..280391501700ea 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -23,13 +23,13 @@ #define SRC_NODE_VERSION_H_ #define NODE_MAJOR_VERSION 14 -#define NODE_MINOR_VERSION 14 -#define NODE_PATCH_VERSION 1 +#define NODE_MINOR_VERSION 15 +#define NODE_PATCH_VERSION 0 -#define NODE_VERSION_IS_LTS 0 -#define NODE_VERSION_LTS_CODENAME "" +#define NODE_VERSION_IS_LTS 1 +#define NODE_VERSION_LTS_CODENAME "Fermium" -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) diff --git a/test/parallel/test-process-release.js b/test/parallel/test-process-release.js index 13263894919407..ebb259f774a62c 100644 --- a/test/parallel/test-process-release.js +++ b/test/parallel/test-process-release.js @@ -19,6 +19,8 @@ if (versionParts[0] === '4' && versionParts[1] >= 2) { assert.strictEqual(process.release.lts, 'Dubnium'); } else if (versionParts[0] === '12' && versionParts[1] >= 13) { assert.strictEqual(process.release.lts, 'Erbium'); +} else if (versionParts[0] === '14' && versionParts[1] >= 15) { + assert.strictEqual(process.release.lts, 'Fermium'); } else { assert.strictEqual(process.release.lts, undefined); }