Drop VS2017 and remove EoL v13.x (#2334)

* doc,win: drop support for VS2017 to build Node.js core * doc: remove information on EOL Node.js 13.x
nodejs · Jun 8, 2020 · 778d77f · 778d77f
1 parent e1f1a1a
commit 778d77f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/doc/windows-visualstudio-supported-versions.md b/doc/windows-visualstudio-supported-versions.md
@@ -12,19 +12,19 @@ Supported versions for running the Node.js installer and executable as released.
 |-----------------|----------------------------|
 | v10             | 7 / 2008 R2                |
 | v12             | 7 / 2008 R2                |
-| v13             | 7 / 2008 R2                |
 | v14             | 8.1 / 2012 R2              |
+| v15             | 8.1 / 2012 R2              |
 
 ## For building Node.js Core
 
 Supported versions for building Node.js from source.
 
 | Node.js Version | Visual Studio Version               |
 |-----------------|-------------------------------------|
-| v10             | 2017 <sup>[5]</sup>                 |
-| v12             | 2017, 2019 (flag) <sup>[8]</sup>    |
-| v13             | 2017, 2019 <sup>[9]</sup>           |
+| v10             | 2017 <sup>[1]</sup>                 |
+| v12             | 2017, 2019 (flag) <sup>[2]</sup>    |
 | v14             | 2017, 2019                          |
+| v15             | 2019 <sup>[4]</sup>                |
 
 ## For building Node.js Addons
 
@@ -33,30 +33,30 @@ Supported versions for building Node.js addons. End-users should have one of the
 | Node.js Version | Visual Studio Version                     |
 |-----------------|-------------------------------------------|
 | v10             | 2015, VCBT2015, 2017                      |
-| v12             | 2015, VCBT2015, 2017, 2019 <sup>[10]</sup> |
-| v13             | 2015, VCBT2015, 2017, 2019                |
+| v12             | 2015, VCBT2015, 2017, 2019 <sup>[3]</sup> |
 | v14             | 2015, VCBT2015, 2017, 2019                |
+| v15             | 2015, VCBT2015, 2017, 2019                |
 
 ## Official Releases
 
 These versions are used to build the official releases.
 
 | Node.js Version | Windows Version | Visual Studio Version |
 |-----------------|-----------------|-----------------------|
-| v10             | 2012 R2         | 2017 <sup>[5]</sup>   |
+| v10             | 2012 R2         | 2017 <sup>[1]</sup>   |
 | v12             | 2012 R2         | 2017                  |
-| v13             | 2012 R2         | 2017                  |
 | v14             | 2012 R2         | 2019                  |
+| v15             | 2012 R2         | 2019                  |
 
 ## References
 
-5. Support for Visual Studio 2015 was removed in v10.0.0.
+1. Support for Visual Studio 2015 was removed in v10.0.0.
    - Pull Request: https://github.com/nodejs/node/pull/16868
    - Pull Request: https://github.com/nodejs/node/pull/16969
-8. Support for Visual Studio 2019 was added behind a flag in v12.8.0.
+2. Support for Visual Studio 2019 was added behind a flag in v12.8.0.
    - Pull Request: https://github.com/nodejs/node/pull/28781
-9. Support for Visual Studio 2019 by default was added in v13.0.1.
-   - Pull Request: https://github.com/nodejs/node/pull/30022
-10. Support for **building addons** with Visual Studio 2019 was added in v12.8.0 (node-gyp 5.0.0).
-    - Pull Request: https://github.com/nodejs/node-gyp/pull/1762
-    - Pull Request: https://github.com/nodejs/node/pull/28853
+3. Support for **building addons** with Visual Studio 2019 was added in v12.8.0 (node-gyp 5.0.0).
+   - Pull Request: https://github.com/nodejs/node-gyp/pull/1762
+   - Pull Request: https://github.com/nodejs/node/pull/28853
+4. Support for Visual Studio 2017 was removed in v15.0.0.
+   - Pull Request: https://github.com/nodejs/node/pull/33694
diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy
@@ -62,7 +62,7 @@ def buildExclusions = [
   [ /vs2013(-\w+)?$/,                 testType,    gte(6)        ],
   [ /vs2015(-\w+)?$/,                 testType,    gte(10)       ],
   [ /vcbt2015(-\w+)?$/,               testType,    gte(10)       ],
-  [ /vs2017(-\w+)?$/,                 testType,    lt(8)         ],
+  [ /vs2017(-\w+)?$/,                 testType,    ltGte(8, 15)  ],
   [ /vs2019(-\w+)?$/,                 testType,    lt(13)        ],
   [ /vs2015-x86$/,                    testType,    gte(10)       ], // compile x86 only once
   [ /vs2017-x86$/,                    testType,    ltGte(10, 14) ],