Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 91a4889

Browse files
committed
Merge in 'release/1.0.0' changes
2 parents 285dbb3 + ae51536 commit 91a4889

File tree

2 files changed

+10
-29
lines changed

2 files changed

+10
-29
lines changed

dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<ExternalExpectedPrerelease>servicing-25316-00</ExternalExpectedPrerelease>
156156

157157
<!-- Central place to set the versions of all nuget packages produced in the repo -->
158-
<Version Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(Version)' == ''">1.0.8</Version>
158+
<Version Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(Version)' == ''">1.0.9</Version>
159159
<WindowsAPISetPackageVersion>1.0.1</WindowsAPISetPackageVersion>
160160
<Win8ArmPackageVersion>$(Version)-$(ExternalExpectedPrerelease)</Win8ArmPackageVersion>
161161

netci.groovy

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ def static getOSGroup(def os) {
1414
'RHEL7.2': 'Linux',
1515
'Ubuntu16.04': 'Linux',
1616
'Debian8.2':'Linux',
17-
'Fedora23':'Linux',
1817
'OSX':'OSX',
1918
'Windows_NT':'Windows_NT',
20-
'FreeBSD':'FreeBSD',
2119
'CentOS7.1': 'Linux',
22-
'OpenSUSE13.2': 'Linux',
2320
'LinuxARMEmulator': 'Linux']
2421
def osGroup = osGroupMap.get(os, null)
2522
assert osGroup != null : "Could not find os group for ${os}"
@@ -32,8 +29,8 @@ class Constants {
3229
// The Windows_NT_BuildOnly OS is a way to speed up the Non-NT builds temporarily by avoiding
3330
// test execution in the build flow runs. It generates the exact same build
3431
// as Windows_NT but without the tests.
35-
def static osList = ['Ubuntu', 'Debian8.2', 'OSX', 'Windows_NT', 'Windows_NT_BuildOnly', 'FreeBSD', 'CentOS7.1', 'OpenSUSE13.2', 'RHEL7.2', 'LinuxARMEmulator', 'Ubuntu16.04', 'Fedora23']
36-
def static crossList = ['Ubuntu', 'OSX', 'CentOS7.1', 'RHEL7.2', 'Debian8.2', 'OpenSUSE13.2']
32+
def static osList = ['Ubuntu', 'Debian8.2', 'OSX', 'Windows_NT', 'Windows_NT_BuildOnly', 'CentOS7.1', 'RHEL7.2', 'LinuxARMEmulator', 'Ubuntu16.04']
33+
def static crossList = ['Ubuntu', 'OSX', 'CentOS7.1', 'RHEL7.2', 'Debian8.2']
3734
// This is a set of JIT stress modes combined with the set of variables that
3835
// need to be set to actually enable that stress mode. The key of the map is the stress mode and
3936
// the values are the environment variables
@@ -260,7 +257,7 @@ def static getJobName(def configuration, def architecture, def os, def scenario,
260257

261258
// **************************
262259
// Define the basic inner loop builds for PR and commit. This is basically just the set
263-
// of coreclr builds over linux/osx/freebsd/windows and debug/release/checked. In addition, the windows
260+
// of coreclr builds over linux/osx/windows and debug/release/checked. In addition, the windows
264261
// builds will do a couple extra steps.
265262
// **************************
266263

@@ -273,7 +270,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
273270
return
274271
}
275272

276-
def bidailyCrossList = ['RHEL7.2', 'Debian8.2', 'OpenSUSE13.2']
273+
def bidailyCrossList = ['RHEL7.2', 'Debian8.2']
277274
// Non pull request builds.
278275
if (!isPR) {
279276
// Check scenario.
@@ -482,8 +479,7 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
482479
break
483480
}
484481
switch (os) {
485-
// OpenSUSE, Debian & RedHat get trigger phrases for pri 0 build, and pri 1 build & test
486-
case 'OpenSUSE13.2':
482+
// Debian & RedHat get trigger phrases for pri 0 build, and pri 1 build & test
487483
case 'Debian8.2':
488484
case 'RHEL7.2':
489485
if (scenario == 'default') {
@@ -495,7 +491,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
495491
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Pri 1 Build & Test", "(?i).*test\\W+${os}\\W+${scenario}.*")
496492
}
497493
break
498-
case 'Fedora23':
499494
case 'Ubuntu16.04':
500495
assert !isFlowJob
501496
assert scenario == 'default'
@@ -982,12 +977,6 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
982977
break
983978
}
984979
break
985-
case 'FreeBSD':
986-
assert scenario == 'default'
987-
if (configuration == 'Checked') {
988-
Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} ${configuration} Build")
989-
}
990-
break
991980
default:
992981
println("Unknown os: ${os}");
993982
assert false
@@ -1543,7 +1532,6 @@ combinedScenarios.each { scenario ->
15431532
// Run the rest of the build
15441533
// Build the mscorlib for the other OS's
15451534
buildCommands += "build.cmd ${lowerConfiguration} ${arch} linuxmscorlib"
1546-
buildCommands += "build.cmd ${lowerConfiguration} ${arch} freebsdmscorlib"
15471535
buildCommands += "build.cmd ${lowerConfiguration} ${arch} osxmscorlib"
15481536

15491537
// Zip up the tests directory so that we don't use so much space/time copying
@@ -1604,11 +1592,8 @@ combinedScenarios.each { scenario ->
16041592
case 'Ubuntu16.04':
16051593
case 'Debian8.2':
16061594
case 'OSX':
1607-
case 'FreeBSD':
16081595
case 'CentOS7.1':
16091596
case 'RHEL7.2':
1610-
case 'OpenSUSE13.2':
1611-
case 'Fedora23':
16121597
switch (architecture) {
16131598
case 'x64':
16141599
case 'x86ryujit':
@@ -1621,11 +1606,7 @@ combinedScenarios.each { scenario ->
16211606
if (!enableCorefxTesting) {
16221607
// We run pal tests on all OS but generate mscorlib (and thus, nuget packages)
16231608
// only on supported OS platforms.
1624-
if ((os == 'FreeBSD') || (os == 'OpenSUSE13.2'))
1625-
{
1626-
buildCommands += "./build.sh skipmscorlib verbose ${lowerConfiguration} ${arch}"
1627-
}
1628-
else if (scenario == 'coverage')
1609+
if (scenario == 'coverage')
16291610
{
16301611
assert os == 'Ubuntu'
16311612
assert lowerConfiguration == 'release'
@@ -1778,7 +1759,7 @@ combinedScenarios.each { scenario ->
17781759
return
17791760
}
17801761
//Skip stress modes for these scenarios
1781-
if (os == 'RHEL7.2' || os == 'Debian8.2' || os == 'OpenSUSE13.2') {
1762+
if (os == 'RHEL7.2' || os == 'Debian8.2') {
17821763
return
17831764
}
17841765
}
@@ -1800,8 +1781,8 @@ combinedScenarios.each { scenario ->
18001781
return
18011782
}
18021783
}
1803-
// For RedHat, Debian, and OpenSUSE, we only do Release pri1 builds.
1804-
else if (os == 'RHEL7.2' || os == 'Debian8.2' || os == 'OpenSUSE13.2') {
1784+
// For RedHat and Debian, we only do Release pri1 builds.
1785+
else if (os == 'RHEL7.2' || os == 'Debian8.2') {
18051786
if (scenario != 'pri1') {
18061787
return
18071788
}

0 commit comments

Comments
 (0)