Skip to content

Commit 3f78e25

Browse files
authored
jenkins: cleanup version selector script (nodejs#4320)
1 parent 050dd58 commit 3f78e25

1 file changed

Lines changed: 14 additions & 34 deletions

File tree

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,47 +20,31 @@ def buildExclusions = [
2020
// Machine Label, Build Type, Node Version
2121

2222
// Linux -------------------------------------------------
23-
[ /debian11/, anyType, gte(23) ],
24-
[ /rhel7/, anyType, gte(18) ],
23+
[ /debian11/, anyType, gte(24) ],
2524
[ /rhel8-ppc64le/, anyType, gte(26) ], // Power 8 was dropped in v26
2625
[ /rhel8-power9le/, releaseType, lt(26) ], // Power 8 was dropped in v26
27-
[ /^ubuntu1604-32/, anyType, gte(18) ], // 32-bit linux for <10 only
28-
[ /^ubuntu1604-64/, anyType, gte(18) ],
2926

3027
// ARM --------------------------------------------------
31-
[ /^ubuntu1804-arm64/, anyType, gte(20) ], // 20.x: gcc8 builds stop
32-
[ /^cross-compiler-ubuntu1604-armv[67]-gcc-4.9/, anyType, gte(18) ],
33-
[ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/, anyType, gte(18) ],
34-
[ /^cross-compiler-ubuntu1804-armv7-gcc-6/, anyType, gte(18) ],
35-
[ /^cross-compiler-ubuntu1804-armv7-gcc-8/, anyType, gte(18) ],
36-
[ /^cross-compiler-rhel8-armv7-gcc-8-glibc-2.28/, anyType, gte(20) ],
37-
[ /^cross-compiler-rhel8-armv7-gcc-10-glibc-2.28/, anyType, lt(20) ],
38-
[ /^cross-compiler-rhel8-armv7-gcc-10-glibc-2.28/, anyType, gte(23) ],
39-
[ /^cross-compiler-rhel9-armv7-gcc-12-glibc-2.28/, anyType, lt(23) ],
28+
[ /^cross-compiler-rhel8-armv7-gcc-8-glibc-2.28/, anyType, gte(22) ],
29+
[ /^cross-compiler-rhel8-armv7-gcc-10-glibc-2.28/, anyType, gte(24) ],
30+
[ /^cross-compiler-rhel9-armv7-gcc-12-glibc-2.28/, anyType, lt(24) ],
4031
[ /armv7/, anyType, gte(24) ],
4132

4233
// Windows -----------------------------------------------
4334
// https://github.com/nodejs/build/blob/main/doc/windows-visualstudio-supported-versions.md
4435
// Release Builders - should only match one VS version per Node.js version
45-
[ /vs2015/, releaseType, gte(18) ],
46-
[ /vs2017/, releaseType, gte(18) ],
47-
[ /vs2019-arm64/, releaseType, lt(20) ],
48-
[ /vs2019/, releaseType, gte(21) ],
49-
[ /vs2022-x86/, releaseType, gte(23) ],
50-
[ /vs2022/, releaseType, lt(21) ],
36+
[ /vs2017/, releaseType, gte(22) ],
37+
[ /vs2019/, releaseType, gte(24) ],
38+
[ /vs2022-x86/, releaseType, gte(24) ],
5139
[ /vs2022(?!_clang)(-\w+)?$/, releaseType, gte(24) ],
5240
[ /vs2022_clang/, releaseType, lt(24) ],
5341
// VS versions supported to compile Node.js - also matches labels used by test runners
54-
[ /vs2015(-\w+)?$/, testType, gte(18) ],
55-
[ /vs2017(-\w+)?$/, testType, gte(18) ],
56-
[ /vs2019(-\w+)?$/, testType, gte(21) ],
57-
[ /vs2022(-\w+)?$/, testType, lt(21) ],
58-
[ /vs2022-x86$/, testType, gte(23) ], // x86 was dropped on Windows in v23
42+
[ /vs2017(-\w+)?$/, testType, gte(22) ],
43+
[ /vs2019(-\w+)?$/, testType, gte(22) ],
44+
[ /vs2022-x86$/, testType, gte(24) ], // x86 was dropped on Windows in v23
5945
[ /vs2022(?!_clang)(-\w+)?$/, testType, gte(24) ], // MSVC was dropped on Windows in v24
6046
[ /vs2022_clang(-\w+)?$/, testType, lt(24) ], // ClangCL support was added in v23
61-
[ /COMPILED_BY-\w+-arm64$/, testType, lt(20) ], // run tests on arm64 for >=19
6247
// VS versions supported to build add-ons
63-
[ /vs2015-COMPILED_BY/, testType, gte(20) ],
6448
[ /vs2017-COMPILED_BY/, testType, gte(22) ],
6549

6650
// AIX ---------------------------------------------------
@@ -71,23 +55,19 @@ def buildExclusions = [
7155
[ /^smartos22/, anyType, gte(26) ],
7256

7357
// FreeBSD -----------------------------------------------
74-
[ /^freebsd12/, anyType, gte(22) ],
7558
[ /^freebsd13/, anyType, gte(22) ], // https://github.com/nodejs/node/issues/54576
7659

7760
// Shared libs docker containers -------------------------
78-
[ /sharedlibs_debug_x64/, anyType, gte(18) ],
79-
[ /sharedlibs_openssl110/, anyType, gte(18) ],
80-
[ /sharedlibs_openssl102/, anyType, gte(18) ],
61+
[ /sharedlibs_debug_x64/, anyType, gte(22) ],
62+
[ /sharedlibs_openssl110/, anyType, gte(22) ],
63+
[ /sharedlibs_openssl102/, anyType, gte(22) ],
8164
[ /sharedlibs_openssl35/, anyType, lt(24) ], // Temporary until test fixes are backported
82-
[ /sharedlibs_fips20/, anyType, gte(18) ],
65+
[ /sharedlibs_fips20/, anyType, gte(22) ],
8366

8467
// macOS -------------------------------------------------
8568
[ /^osx13/, anyType, gte(25) ],
8669
[ /^macos15/, anyType, lt(25) ],
8770

88-
// Source / headers / docs -------------------------------
89-
[ /^rhel8-release-sources$/, releaseType, lt(18) ],
90-
9171
// -------------------------------------------------------
9272
]
9373

0 commit comments

Comments
 (0)