From cfd2715aec8f915715d83610504b0d76340323cd Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Wed, 5 Dec 2018 15:33:57 -0500 Subject: [PATCH] Enable Windows ARM64 CI PR builds Commit migrated from https://github.com/dotnet/core-setup/commit/10ed85d036531151d042e13a5a6feb9af781886e --- src/installer/netci.groovy | 51 ++++++++++------------------------------------ 1 file changed, 11 insertions(+), 40 deletions(-) diff --git a/src/installer/netci.groovy b/src/installer/netci.groovy index f5d2d64..8a086c6 100644 --- a/src/installer/netci.groovy +++ b/src/installer/netci.groovy @@ -10,7 +10,17 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Linux:x64:Release', 'Linux:arm:Release', 'Linux:arm64:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'Tizen:armel:Release'] +def platformList = [ + 'Linux:x64:Release', + 'Linux:arm:Release', + 'Linux:arm64:Release', + 'OSX:x64:Release', + 'Windows_NT:x64:Release', + 'Windows_NT:x86:Debug', + 'Windows_NT:arm64:Debug', + 'Windows_NT:arm:Debug', + 'Tizen:armel:Release' +] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() @@ -120,45 +130,6 @@ platformList.each { platform -> Utilities.addArchival(newJob, settings) } -// ************************** -// Define ARM64 building. -// ************************** -//['Windows_NT'].each { os -> -// ['Release'].each { configurationGroup -> -// def newJobName = "${configurationGroup.toLowerCase()}_${os.toLowerCase()}_arm64" -// def arm64Users = ['ianhays', 'kyulee1', 'gkhanna79', 'weshaggard', 'stephentoub', 'rahku', 'ramarag'] -// def newJob = job(Utilities.getFullJobName(project, newJobName, /* isPR */ false)) { -// steps { -// // build the world, but don't run the tests -// batchFile("build.cmd -ConfigurationGroup ${configurationGroup} -Architecure x64 -TargetArch arm64 -ToolsetDir C:\\ats2 -Framework netcoreapp1.1") -// } -// label("arm64") -// -// // Kick off the test run -// publishers { -// archiveArtifacts { -// pattern("artifacts/win10-arm64/packages/*.zip") -// pattern("artifacts/win10-arm64/corehost/*.nupkg") -// onlyIfSuccessful(true) -// allowEmpty(false) -// } -// } -// } -// -// // Set up standard options. -// Utilities.standardJobSetup(newJob, project, /* isPR */ false, "*/${branch}") -// -// // Set a daily trigger -// Utilities.addPeriodicTrigger(newJob, '@daily') -// -// // Set up a PR trigger that is only triggerable by certain members -// Utilities.addPrivateGithubPRTriggerForBranch(newJob, branch, "Windows_NT ARM64 ${configurationGroup} Build", "(?i).*test\\W+ARM64\\W+${os}\\W+${configurationGroup}", null, arm64Users) -// -// // Set up a per-push trigger -// Utilities.addGithubPushTrigger(newJob) -// } -//} - // Make the call to generate the help job Utilities.createHelperJob(this, project, branch, "Welcome to the ${project} Repository", // This is prepended to the help message -- 2.7.4