Skip to content
Snippets Groups Projects
Commit be453f8f authored by Lars Bilke's avatar Lars Bilke
Browse files

[Jenkins] Use checkoutWithTag to fetch tags correctly.

This fixes artifact naming.
parent 9b1a5302
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env groovy #!/usr/bin/env groovy
@Library('jenkins-pipeline@1.0.1') _ @Library('jenkins-pipeline@1.0.2') _
def builders = [:] def builders = [:]
def helper = new ogs.helper() def helper = new ogs.helper()
...@@ -8,35 +8,35 @@ timestamps { ...@@ -8,35 +8,35 @@ timestamps {
builders['gcc'] = { builders['gcc'] = {
node('docker') { node('docker') {
dir('ogs') { checkout scm } dir('ogs') { checkoutWithTags() }
load 'ogs/scripts/jenkins/gcc.groovy' load 'ogs/scripts/jenkins/gcc.groovy'
} }
} }
builders['gcc-conan'] = { builders['gcc-conan'] = {
node('docker') { node('docker') {
dir('ogs') { checkout scm } dir('ogs') { checkoutWithTags() }
load 'ogs/scripts/jenkins/gcc-conan.groovy' load 'ogs/scripts/jenkins/gcc-conan.groovy'
} }
} }
builders['gcc-dynamic'] = { builders['gcc-dynamic'] = {
node('envinf1') { node('envinf1') {
dir('ogs') { checkout scm } dir('ogs') { checkoutWithTags() }
load 'ogs/scripts/jenkins/gcc-dynamic.groovy' load 'ogs/scripts/jenkins/gcc-dynamic.groovy'
} }
} }
builders['msvc'] = { builders['msvc'] = {
node('win && conan') { node('win && conan') {
dir('ogs') { checkout scm } dir('ogs') { checkoutWithTags() }
load 'ogs/scripts/jenkins/msvc.groovy' load 'ogs/scripts/jenkins/msvc.groovy'
} }
} }
builders['mac'] = { builders['mac'] = {
node('mac') { node('mac') {
dir('ogs') { checkout scm } dir('ogs') { checkoutWithTags() }
load 'ogs/scripts/jenkins/mac.groovy' load 'ogs/scripts/jenkins/mac.groovy'
} }
} }
...@@ -44,7 +44,7 @@ builders['mac'] = { ...@@ -44,7 +44,7 @@ builders['mac'] = {
if (helper.isRelease(this)) { if (helper.isRelease(this)) {
builders['msvc32'] = { builders['msvc32'] = {
node('win && conan') { node('win && conan') {
dir('ogs') { checkout scm } dir('ogs') { checkoutWithTags() }
load 'ogs/scripts/jenkins/msvc32.groovy' load 'ogs/scripts/jenkins/msvc32.groovy'
} }
} }
...@@ -52,7 +52,7 @@ if (helper.isRelease(this)) { ...@@ -52,7 +52,7 @@ if (helper.isRelease(this)) {
builders['docs'] = { builders['docs'] = {
node('docker') { node('docker') {
dir('ogs') { checkout scm } dir('ogs') { checkoutWithTags() }
load 'ogs/scripts/jenkins/docs.groovy' load 'ogs/scripts/jenkins/docs.groovy'
} }
} }
...@@ -66,7 +66,7 @@ if (currentBuild.result == "SUCCESS" || currentBuild.result == "UNSTABLE") { ...@@ -66,7 +66,7 @@ if (currentBuild.result == "SUCCESS" || currentBuild.result == "UNSTABLE") {
build job: 'OGS-6/clang-sanitizer', wait: false build job: 'OGS-6/clang-sanitizer', wait: false
def tag = "" def tag = ""
node('master') { node('master') {
checkout scm checkoutWithTags()
tag = helper.getTag() tag = helper.getTag()
} }
if (tag != "") { if (tag != "") {
...@@ -74,7 +74,7 @@ if (currentBuild.result == "SUCCESS" || currentBuild.result == "UNSTABLE") { ...@@ -74,7 +74,7 @@ if (currentBuild.result == "SUCCESS" || currentBuild.result == "UNSTABLE") {
currentBuild.displayName = tag currentBuild.displayName = tag
node('mac') { node('mac') {
dir('ogs') { checkout scm } dir('ogs') { checkoutWithTags() }
load 'ogs/scripts/jenkins/docset.groovy' load 'ogs/scripts/jenkins/docset.groovy'
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment