Merge pull request #1974 from bilke/jenkins-checkout

Jenkins checkout

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'
             }
         }

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 '
 

scripts/jenkins/msvc.groovy

 
 def defaultCMakeOptions =
     '-DOGS_USE_CONAN=ON ' +
+    '-DOGS_CONAN_BUILD=never ' +
     '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON ' +
     '-DOGS_PACKAGE_DEPENDENCIES=ON '
 

scripts/jenkins/msvc32.groovy

 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 ' +