Skip to content

Commit d19145e

Browse files
authored
jenkins: run win32 CI on Node.js 19
Run 32-bit Windows CI for Node.js 19 but skip (for now) on Node.js 18. Introduce a new `gteLt` closure for exclusions between two versions. Refs: nodejs/node#42690 Refs: nodejs/node#42740 (comment) Refs: #2921
1 parent b6230d5 commit d19145e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// Helper closures to make our buildExclusions DSL terse and readable
55
def lt = { v -> { nodeVersion -> nodeVersion < v } }
66
def gte = { v -> { nodeVersion -> nodeVersion >= v } }
7+
def gteLt = { vGte, vLt -> { nodeVersion -> gte(vGte)(nodeVersion) && lt(vLt)(nodeVersion) } }
78
def ltGte = { vLt, vGte -> { nodeVersion -> lt(vLt)(nodeVersion) || gte(vGte)(nodeVersion) } }
89
def allVer = { nodeVersion -> true }
910
def noVer = { nodeVersion -> false }
@@ -73,7 +74,7 @@ def buildExclusions = [
7374
[ /vs2015/, releaseType, ltGte(6, 10) ],
7475
[ /vs2017/, releaseType, ltGte(10, 14) ],
7576
[ /vs2019/, releaseType, lt(14) ],
76-
[ /vs2019-x86/, releaseType, gte(18) ], // Temporary, https://github.com/nodejs/node/pull/42666
77+
[ /vs2019-x86/, releaseType, gteLt(18, 19) ], // Temporary, https://github.com/nodejs/node/pull/42666
7778
// VS versions supported to compile Node.js - also matches labels used by test runners
7879
[ /vs2013(-\w+)?$/, testType, gte(6) ],
7980
[ /vs2015(-\w+)?$/, testType, gte(10) ],
@@ -83,7 +84,7 @@ def buildExclusions = [
8384
[ /vs2015-x86$/, testType, gte(10) ], // compile arm64/x86 only once
8485
[ /vs2017-x86$/, testType, ltGte(10, 14) ],
8586
[ /vs2019-x86$/, testType, lt(14) ],
86-
[ /vs2019-x86$/, testType, gte(18) ], // Temporary, https://github.com/nodejs/node/pull/42666
87+
[ /vs2019-x86$/, testType, gteLt(18, 19) ], // Temporary, https://github.com/nodejs/node/pull/42666
8788
[ /vs2019-arm64$/, testType, lt(14) ],
8889
// VS versions supported to build add-ons
8990
[ /vs2013-COMPILED_BY/, testType, gte(9) ],

0 commit comments

Comments
 (0)