From ef35ac10da928bc5a4697a1062d0c79372adb4a7 Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Tue, 23 May 2017 17:35:03 -0700 Subject: [PATCH] Fix OSX CI leg (dotnet/core-setup#2499) * Fix OSX CI leg * Remove unrequired PortableBuild specification Commit migrated from https://github.com/dotnet/core-setup/commit/67d7106bbef39d1bd70523050e06fc378b56f151 --- src/installer/netci.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/installer/netci.groovy b/src/installer/netci.groovy index bd2bcae..2f47d3d 100644 --- a/src/installer/netci.groovy +++ b/src/installer/netci.groovy @@ -57,7 +57,7 @@ platformList.each { platform -> if (architecture == 'arm' || architecture == 'armel') { dockerContainer = "ubuntu-14.04-cross-0cd4667-20172211042239" dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture} --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" - buildArgs += " -PortableBuild=true -DistroRid=linux-${architecture} -SkipTests=true -DisableCrossgen=true -CrossBuild=true" + buildArgs += " -DistroRid=linux-${architecture} -SkipTests=true -DisableCrossgen=true -CrossBuild=true" buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" osForGHTrigger = "Linux" @@ -75,6 +75,7 @@ platformList.each { platform -> else { // Jenkins non-Ubuntu CI machines don't have docker buildCommand = "./build.sh ${buildArgs}" + os = "OSX10.12" } def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { -- 2.7.4