From 6ccdbdc0b12b6c40f2bd3803bf9e747973ea0e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Reis?= Date: Thu, 23 Mar 2023 00:01:33 +0000 Subject: [PATCH] jenkins: run ARM64 Windows tests on Node.js >=19 --- jenkins/scripts/VersionSelectorScript.groovy | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 0ff925104..f2ac366a7 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -84,6 +84,7 @@ def buildExclusions = [ [ /vs2017-x86$/, testType, ltGte(10, 14) ], [ /vs2019-x86$/, testType, lt(14) ], [ /vs2019-arm64$/, testType, lt(14) ], + [ /COMPILED_BY-\w+-arm64$/, testType, lt(19) ], // run tests on arm64 for >=19 // VS versions supported to build add-ons [ /vs2013-COMPILED_BY/, testType, gte(9) ], [ /vs2015-COMPILED_BY/, testType, gte(19) ], @@ -191,12 +192,5 @@ combinations.each{ return } } - // Run tests on Windows ARM64 only if explicitly requested - if (builderLabel =~ /^win.*COMPILED_BY.*-arm64$/) { - if (!new String(parameters['RUN_ARM64_TESTS']).equalsIgnoreCase("true")){ - println "Skipping $builderLabel because RUN_ARM64_TESTS is not selected" - return - } - } result['nodes'].add(it) }