diff --git a/Jenkinsfile b/Jenkinsfile index d3c14d8a2ff9b6e4afcf46012691855b64aea03d..f9f9d2d03d6bb7f3e11ec98223f8d6a3a051489c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ timestamps { builders['gcc'] = { node('docker') { dir('ogs') { - checkoutWithTags() + checkout scm tag = helper.getTag() } load 'ogs/scripts/jenkins/gcc.groovy' @@ -19,36 +19,36 @@ builders['gcc'] = { builders['gcc-conan'] = { node('docker') { - dir('ogs') { checkoutWithTags() } + dir('ogs') { checkout scm } load 'ogs/scripts/jenkins/gcc-conan.groovy' } } builders['gcc-dynamic'] = { node('envinf1') { - dir('ogs') { checkoutWithTags() } + dir('ogs') { checkout scm } load 'ogs/scripts/jenkins/gcc-dynamic.groovy' } } builders['msvc'] = { node('win && conan') { - dir('ogs') { checkoutWithTags() } + dir('ogs') { checkout scm } load 'ogs/scripts/jenkins/msvc.groovy' } } -builders['mac'] = { - node('mac') { - dir('ogs') { checkoutWithTags() } +// builders['mac'] = { + // node('mac') { + // dir('ogs') { checkout scm } // load 'ogs/scripts/jenkins/mac.groovy' - } -} + // } +// } if (helper.isRelease(this)) { builders['msvc32'] = { node('win && conan') { - dir('ogs') { checkoutWithTags() } + dir('ogs') { checkout scm } load 'ogs/scripts/jenkins/msvc32.groovy' } } @@ -57,7 +57,7 @@ if (helper.isRelease(this)) { if (helper.isOriginMaster(this)) { builders['coverage'] = { node('docker') { - dir('ogs') { checkoutWithTags() } + dir('ogs') { checkout scm } load 'ogs/scripts/jenkins/coverage.groovy' } } @@ -75,7 +75,7 @@ catch (err) { } node('master') { - checkoutWithTags() + checkout scm step([$class: 'LogParserPublisher', failBuildOnError: true, projectRulePath: "scripts/jenkins/all-log-parser.rules", @@ -94,7 +94,7 @@ if (helper.isOriginMaster(this)) { helper.notification(msg: "Marked build for ${tag}.", script: this) node('mac') { - dir('ogs') { checkoutWithTags() } + dir('ogs') { checkout scm } load 'ogs/scripts/jenkins/docset.groovy' } } diff --git a/scripts/jenkins/gcc-conan.groovy b/scripts/jenkins/gcc-conan.groovy index 708a927e388c077bc398992973b832b15e442d58..bdedf194731307d95b51b09238fd9e139b26e7c7 100644 --- a/scripts/jenkins/gcc-conan.groovy +++ b/scripts/jenkins/gcc-conan.groovy @@ -4,6 +4,7 @@ def defaultDockerArgs = '-v /home/jenkins/.ccache:/usr/src/.ccache ' + def defaultCMakeOptions = '-DCMAKE_BUILD_TYPE=Release ' + '-DOGS_USE_CONAN=ON ' + + '-DOGS_CONAN_BUILD=never ' + '-DOGS_CPU_ARCHITECTURE=generic ' + '-DOGS_PACKAGE_DEPENDENCIES=ON ' diff --git a/scripts/jenkins/msvc.groovy b/scripts/jenkins/msvc.groovy index e589f0b8eb75f3685151facad480e365594344e0..1b9956e358bb6db3f3933cfc85555f91f70e0be3 100644 --- a/scripts/jenkins/msvc.groovy +++ b/scripts/jenkins/msvc.groovy @@ -1,6 +1,7 @@ def defaultCMakeOptions = '-DOGS_USE_CONAN=ON ' + + '-DOGS_CONAN_BUILD=never ' + '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' + '-DOGS_PACKAGE_DEPENDENCIES=ON ' diff --git a/scripts/jenkins/msvc32.groovy b/scripts/jenkins/msvc32.groovy index d9a512331191152404b69bfe1bd7c5f252c2bbf7..a66f0fe2b08d97c81dcce9f64a6d12fa0ff10c9e 100644 --- a/scripts/jenkins/msvc32.groovy +++ b/scripts/jenkins/msvc32.groovy @@ -1,6 +1,7 @@ def defaultCMakeOptions = '-DCMAKE_BUILD_TYPE=Release ' + '-DOGS_USE_CONAN=ON ' + + '-DOGS_CONAN_BUILD=never ' + '-DOGS_32_BIT=ON ' + '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' + '-DOGS_PACKAGE_DEPENDENCIES=ON ' +