diff options
| author | Gaurav Khanna (CLR) <gaurav.khanna@microsoft.com> | 2016-02-08 12:16:01 -0800 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-02-08 14:51:40 -0800 |
| commit | 10a478e3a1311993433c480cacead8c3d8e7e814 (patch) | |
| tree | 178f32a8465f9e963d4a64dd4a442eb8a15b58e5 /netci.groovy | |
| parent | 09bd376860d4d4add1ef55865a7aa78e2f51c52c (diff) | |
| download | coreclr-10a478e3a1311993433c480cacead8c3d8e7e814.tar.gz coreclr-10a478e3a1311993433c480cacead8c3d8e7e814.tar.bz2 coreclr-10a478e3a1311993433c480cacead8c3d8e7e814.zip | |
Update CI to no longer request mscorlib build for osx/ubuntu on Windows.
Diffstat (limited to 'netci.groovy')
| -rw-r--r-- | netci.groovy | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/netci.groovy b/netci.groovy index f5802c5606..d7cf0c949f 100644 --- a/netci.groovy +++ b/netci.groovy @@ -666,11 +666,13 @@ combinedScenarios.each { scenario -> } // Run the rest of the build - // Build the mscorlib for the other OS's + + // Remove this command step once we can build mscorlib on CentOS/OpenSuse buildCommands += "build.cmd ${lowerConfiguration} ${architecture} linuxmscorlib" + + // Remove this command step once we can build mscorlib on FreeBSD buildCommands += "build.cmd ${lowerConfiguration} ${architecture} freebsdmscorlib" - buildCommands += "build.cmd ${lowerConfiguration} ${architecture} osxmscorlib" - + if (!enableCorefxTesting) { // Zip up the tests directory so that we don't use so much space/time copying // 10s of thousands of files around. @@ -719,10 +721,15 @@ combinedScenarios.each { scenario -> switch (architecture) { case 'x64': case 'x86': - // Build commands are the same regardless of scenario on non-Windows other OS's. - // On other OS's we skipmscorlib but run the pal tests - buildCommands += "./build.sh skipmscorlib verbose ${lowerConfiguration} ${architecture}" + if ((architecture == 'x64') && ((os == 'Ubuntu') || (os == 'OSX'))) + { + buildCommands += "./build.sh verbose ${lowerConfiguration} ${architecture}" + } + else + { + buildCommands += "./build.sh skipmscorlib verbose ${lowerConfiguration} ${architecture}" + } buildCommands += "src/pal/tests/palsuite/runpaltests.sh \${WORKSPACE}/bin/obj/${osGroup}.${architecture}.${configuration} \${WORKSPACE}/bin/paltestout" // Basic archiving of the build |