Merge remote-tracking branch 'origin/master' into production
This commit is contained in:
commit
aeb4ba0096
2 changed files with 15 additions and 6 deletions
|
|
@ -31,17 +31,25 @@ def doExport(exportfolder, exportpathlist, build_variant = "") {
|
|||
// Build and export files
|
||||
def doBuild(apps, exportfolder = "${WORKSPACE}/bin") {
|
||||
for (appInfo in apps ) {
|
||||
(build, project, variants, exportpathlist) = appInfo
|
||||
(build, cleanbuild, project, variants, exportpathlist) = appInfo
|
||||
if (build) {
|
||||
if (cleanbuild) {
|
||||
buildtype = "-cleanBuild"
|
||||
}
|
||||
else {
|
||||
buildtype = "-build"
|
||||
}
|
||||
for (build_variant in variants) {
|
||||
retry(3) { // Eclipse occasionally raises exceptions (rather than the builds failing)
|
||||
retry(maxprojectbuildretries) { // Eclipse occasionally raises exceptions (rather than the builds failing)
|
||||
echo "Build command: ${DS5SHELL} \'${BUILD_COMMAND} ${buildtype} \"${project}/${build_variant}\"\'"
|
||||
if (isUnix()) {
|
||||
echo "Build command: ${BUILD_COMMAND} -build \"${project}/${build_variant}\""
|
||||
sh "${BUILD_COMMAND} -build \"${project}/${build_variant}\""
|
||||
sh """
|
||||
${DS5SHELL} \'${BUILD_COMMAND} ${buildtype} \"${project}/${build_variant}\"\'
|
||||
"""
|
||||
}
|
||||
else {
|
||||
bat """
|
||||
"%BUILD_COMMAND%" -build "${project}\\${build_variant}"
|
||||
"%DS5SHELL%" "%BUILD_COMMAND%" ${buildtype} "${project}\\${build_variant}"
|
||||
"""
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ def gitCheckout(String gitURL, String revision, String targetDir, String repoRoo
|
|||
],
|
||||
doGenerateSubmoduleConfigurations: false,
|
||||
extensions: [
|
||||
[$class: 'GitLFSPull'],
|
||||
[$class: 'CleanBeforeCheckout'],
|
||||
[$class: 'CloneOption', depth: cloneDepth, noTags: false, reference: reporootpath, shallow: shallowClone, timeout: 120],
|
||||
[$class: 'CheckoutOption', timeout: 120],
|
||||
|
|
@ -59,4 +60,4 @@ boolean checkAllVersionsAgree(java.util.LinkedHashMap versions) {
|
|||
return true
|
||||
}
|
||||
|
||||
return this
|
||||
return this
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue