diff --git a/Jenkinsfile b/Jenkinsfile index c29f09bedb297f303bd2ba80acaa0078589cb87b..ec8b9dce799239964825b5d5cfc3d807ee6313ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,10 +7,7 @@ helper = null node('master') { step([$class: 'GitHubSetCommitStatusBuilder', statusMessage: [content: 'Started Jenkins build']]) - - stage 'Checkout' checkout scm - stash name: 'source', useDefaultExcludes: false configure = load 'scripts/jenkins/lib/configure.groovy' build = load 'scripts/jenkins/lib/build.groovy' diff --git a/scripts/jenkins/gcc.groovy b/scripts/jenkins/gcc.groovy index 5e97657ba583fc0cfbc401d68d778b624f3fca60..eebba790292fa0fe2556531befebc7845bf39e45 100644 --- a/scripts/jenkins/gcc.groovy +++ b/scripts/jenkins/gcc.groovy @@ -4,7 +4,8 @@ node('docker') { '-DOGS_LIB_BOOST=System ' + '-DOGS_LIB_VTK=System' - dir('ogs') { unstash 'source' } + stage 'Checkout (Linux-Docker)' + dir('ogs') { checkout scm } docker.image('ogs6/gcc-gui:latest').inside(defaultDockerArgs) { stage 'Configure (Linux-Docker)' diff --git a/scripts/jenkins/mac.groovy b/scripts/jenkins/mac.groovy index 89df106322ed06beb7fd1bf7db989c54fa73c1ea..1669d612a48b2f0ead5fb7a45e9816e1b59b729b 100644 --- a/scripts/jenkins/mac.groovy +++ b/scripts/jenkins/mac.groovy @@ -6,7 +6,8 @@ node('mac && conan') { '-DOGS_LIB_VTK=System ' + '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON' - dir('ogs') { unstash 'source' } + stage 'Checkout (Mac)' + dir('ogs') { checkout scm } stage 'Configure (Mac)' configure.linux 'build', "${defaultCMakeOptions}", 'Ninja', '' diff --git a/scripts/jenkins/msvc.groovy b/scripts/jenkins/msvc.groovy index b2a90af7816960ac19d892b1df4c36807091284f..6c70d9e68cfba18eff8c46f1c654415ea08ccc6f 100644 --- a/scripts/jenkins/msvc.groovy +++ b/scripts/jenkins/msvc.groovy @@ -11,7 +11,8 @@ node('win && conan') { '-DOGS_BUILD_TESTS=OFF ' + '-DOGS_BUILD_SWMM=ON' - dir('ogs') { unstash 'source' } + stage 'Checkout (Win)' + dir('ogs') { checkout scm } withEnv(helper.getEnv()) { stage 'Configure (Win)' diff --git a/scripts/jenkins/msvc32.groovy b/scripts/jenkins/msvc32.groovy index d96cfcfe0b2b3402e2c11259e49bb5cc850338b5..13f858fcfab6b601f3953d373c5807d0488cf0fe 100644 --- a/scripts/jenkins/msvc32.groovy +++ b/scripts/jenkins/msvc32.groovy @@ -6,7 +6,8 @@ node('win && conan') { '-DOGS_LIB_VTK=System ' + '-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON' - dir('ogs') { unstash 'source' } + stage 'Checkout (Win)' + dir('ogs') { checkout scm } stage 'Data Explorer 32-bit (Win)' withEnv(helper.getEnv('x32')) {