Skip to content

Commit

Permalink
jenkins: add ARM64 Windows
Browse files Browse the repository at this point in the history
PR-URL: #2408
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Ash Cripps <ashley.cripps@ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
joaocgreis authored and Ash Cripps committed Jan 8, 2021
1 parent 0773ec1 commit f353e84
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
10 changes: 9 additions & 1 deletion jenkins/scripts/VersionSelectorScript.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ def buildExclusions = [
[ /vcbt2015(-\w+)?$/, testType, gte(10) ],
[ /vs2017(-\w+)?$/, testType, ltGte(8, 15) ],
[ /vs2019(-\w+)?$/, testType, lt(13) ],
[ /vs2015-x86$/, testType, gte(10) ], // compile x86 only once
[ /vs2015-x86$/, testType, gte(10) ], // compile arm64/x86 only once
[ /vs2017-x86$/, testType, ltGte(10, 14) ],
[ /vs2019-x86$/, testType, lt(14) ],
[ /vs2019-arm64$/, testType, lt(14) ],
// VS versions supported to build add-ons
[ /vs2013-COMPILED_BY/, testType, gte(9) ],
[ /vs2015-COMPILED_BY/, testType, noVer ],
Expand Down Expand Up @@ -164,5 +165,12 @@ combinations.each{
return
}
}
// Run tests on Windows ARM64 only if explicitly requested
if (builderLabel =~ /^win.*COMPILED_BY.*-arm64$/) {
if (!parameters['RUN_ARM64_TESTS'].toString().equalsIgnoreCase("true")){
println "Skipping $builderLabel because RUN_ARM64_TESTS is not selected"
return
}
}
result['nodes'].add(it)
}
5 changes: 4 additions & 1 deletion jenkins/scripts/windows/compile.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ if not defined DISABLE_CLCACHE if exist C:\clcache\dist\clcache_main\clcache_mai
)

:: Call vcbuild
if "%nodes:~-4%" == "-x86" (
if "%nodes:~-6%" == "-arm64" (
:: Building MSI is not yet supported for ARM64
set "VCBUILD_EXTRA_ARGS=arm64 release"
) else if "%nodes:~-4%" == "-x86" (
set "VCBUILD_EXTRA_ARGS=x86 %VCBUILD_EXTRA_ARGS%"
) else (
set "VCBUILD_EXTRA_ARGS=x64 %VCBUILD_EXTRA_ARGS%"
Expand Down

0 comments on commit f353e84

Please sign in to comment.