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); }