Skip to content

Commit f00f7f9

Browse files
swgillespiemanofstick
authored andcommitted
Enable Standalone GC builds in the CI on OSX and Linux (dotnet#8950)
1 parent a77b367 commit f00f7f9

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

netci.groovy

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
461461
// addEmailPublisher(job, 'dotnetgctests@microsoft.com')
462462
break
463463
case 'standalone_gc':
464-
assert (os == 'Windows_NT')
464+
assert (os == 'Ubuntu' || os == 'Windows_NT' || os == 'OSX')
465465
assert (configuration == 'Release' || configuration == 'Checked')
466466
// TODO: Add once external email sending is available again
467467
// addEmailPublisher(job, 'dotnetgctests@microsoft.com')
@@ -1541,6 +1541,11 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
15411541
"(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*")
15421542
}
15431543
break
1544+
case 'standalone_gc':
1545+
if (configuration == 'Release' || configuration == 'Checked') {
1546+
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Standalone GC", "(?i).*test\\W+${os}\\W+${configuration}\\W+${scenario}.*")
1547+
}
1548+
break
15441549
case 'minopts':
15451550
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${arch} ${jit} ${configuration} Build and Test (Jit - MinOpts)",
15461551
"(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*")
@@ -1744,6 +1749,11 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
17441749
"(?i).*test\\W+${os}\\W+${arch}\\W+${jit}\\W+${configuration}\\W+${scenario}.*")
17451750
}
17461751
break
1752+
case 'standalone_gc':
1753+
if (configuration == 'Release' || configuration == 'Checked') {
1754+
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Standalone GC", "(?i).*test\\W+${os}\\W+${configuration}\\W+${scenario}.*")
1755+
}
1756+
break
17471757
default:
17481758
println("Unknown scenario: ${os} ${arch} ${jit} ${scenario}");
17491759
assert false
@@ -2029,19 +2039,24 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
20292039
Utilities.addArchival(newJob, "format.patch", "", true, false)
20302040
break
20312041
}
2042+
2043+
def standaloneGc = ''
2044+
if (scenario == 'standalone_gc') {
2045+
standaloneGc = 'buildstandalonegc'
2046+
}
20322047

20332048
if (!enableCorefxTesting) {
20342049
// We run pal tests on all OS but generate mscorlib (and thus, nuget packages)
20352050
// only on supported OS platforms.
20362051
if ((os == 'FreeBSD') || (os == 'OpenSUSE13.2'))
20372052
{
2038-
buildCommands += "./build.sh skipmscorlib verbose ${lowerConfiguration} ${arch}"
2053+
buildCommands += "./build.sh skipmscorlib verbose ${lowerConfiguration} ${arch} ${standaloneGc}"
20392054
}
20402055
else
20412056
{
20422057
def bootstrapRid = Utilities.getBoostrapPublishRid(os)
20432058
def bootstrapRidEnv = bootstrapRid != null ? "__PUBLISH_RID=${bootstrapRid} " : ''
2044-
buildCommands += "${bootstrapRidEnv}./build.sh verbose ${lowerConfiguration} ${arch}"
2059+
buildCommands += "${bootstrapRidEnv}./build.sh verbose ${lowerConfiguration} ${arch} ${standaloneGc}"
20452060
}
20462061
buildCommands += "src/pal/tests/palsuite/runpaltests.sh \${WORKSPACE}/bin/obj/${osGroup}.${arch}.${configuration} \${WORKSPACE}/bin/paltestout"
20472062

@@ -2354,7 +2369,7 @@ combinedScenarios.each { scenario ->
23542369
}
23552370
break
23562371
case 'standalone_gc':
2357-
if (os != 'Windows_NT') {
2372+
if (os != 'Windows_NT' && os != 'Ubuntu' && os != 'OSX') {
23582373
return
23592374
}
23602375

0 commit comments

Comments
 (0)