Add CI support for the Linux Portable build (#5872)
* WIP attempt to use the Linux RID * Pass the --linux-portable parameter
This commit is contained in:
parent
5a5dfecad7
commit
5cc689d07b
1 changed files with 5 additions and 1 deletions
|
@ -9,7 +9,7 @@ def project = GithubProject
|
||||||
def branch = GithubBranchName
|
def branch = GithubBranchName
|
||||||
def isPR = true
|
def isPR = true
|
||||||
|
|
||||||
def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug']
|
def platformList = ['Linux:x64:Release', 'Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug']
|
||||||
|
|
||||||
def static getBuildJobName(def configuration, def os, def architecture) {
|
def static getBuildJobName(def configuration, def os, def architecture) {
|
||||||
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
|
return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
|
||||||
|
@ -34,6 +34,10 @@ platformList.each { platform ->
|
||||||
else if (os == 'Ubuntu') {
|
else if (os == 'Ubuntu') {
|
||||||
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu.14.04 --targets Default"
|
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu.14.04 --targets Default"
|
||||||
}
|
}
|
||||||
|
else if (os == 'Linux') {
|
||||||
|
os = 'Ubuntu16.04';
|
||||||
|
buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --targets Default
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
// Jenkins non-Ubuntu CI machines don't have docker
|
// Jenkins non-Ubuntu CI machines don't have docker
|
||||||
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"
|
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue