From 13aa2b463144096631d6f9b628e6de42a1cbf978 Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Mon, 2 Oct 2017 17:05:38 +0200 Subject: [PATCH] Fix RHEL.6 CI build (dotnet/corefx#24331) I have missed msbuild options separator in the build.sh invocation when adding the /p:PortableBuild=false option. Commit migrated from https://github.com/dotnet/corefx/commit/df8e3b568b3115e09df264dd891f218c5d288385 --- src/libraries/buildpipeline/centos.6.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/buildpipeline/centos.6.groovy b/src/libraries/buildpipeline/centos.6.groovy index d247aa3..40c22ed 100644 --- a/src/libraries/buildpipeline/centos.6.groovy +++ b/src/libraries/buildpipeline/centos.6.groovy @@ -21,13 +21,13 @@ simpleDockerNode('microsoft/dotnet-buildtools-prereqs:centos-6-783abde-201713041 } stage ('Generate version assets') { // Generate the version assets. Do we need to even do this for non-official builds? - sh "LD_LIBRARY_PATH=/usr/local/lib ./build-managed.sh -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:PortableBuild=false" + sh "LD_LIBRARY_PATH=/usr/local/lib ./build-managed.sh -runtimeos=rhel.6 -- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:PortableBuild=false" } stage ('Sync') { - sh "LD_LIBRARY_PATH=/usr/local/lib ./sync.sh -p -- /p:ArchGroup=x64 /p:PortableBuild=false" + sh "LD_LIBRARY_PATH=/usr/local/lib ./sync.sh -p -runtimeos=rhel.6 -- /p:ArchGroup=x64 /p:PortableBuild=false" } stage ('Build Product') { - sh "LD_LIBRARY_PATH=/usr/local/lib ./build.sh -buildArch=x64 -${params.CGroup} /p:PortableBuild=false" + sh "LD_LIBRARY_PATH=/usr/local/lib ./build.sh -buildArch=x64 -runtimeos=rhel.6 -${params.CGroup} -- /p:PortableBuild=false" } stage ('Build Tests') { def additionalArgs = '' -- 2.7.4