From 28496ae9bfa90c6233f1b19f7ea62cf3cb54de7b Mon Sep 17 00:00:00 2001 From: Jim Nicholson Date: Thu, 23 Dec 2021 14:51:39 -0800 Subject: [PATCH] Some versioning work --- .mvn/jgitver.config.xml | 2 +- Jenkinsfile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.mvn/jgitver.config.xml b/.mvn/jgitver.config.xml index ecd9df2..da2d283 100644 --- a/.mvn/jgitver.config.xml +++ b/.mvn/jgitver.config.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jgitver.github.io/maven/configuration/1.1.0 https://jgitver.github.io/maven/configuration/jgitver-configuration-v1_1_0.xsd"> - MAVEN + PATTERN true true \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 60212d4..730614a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,11 @@ podTemplate(label: label, containers: [ GIT_HASH = sh ( script: 'git rev-parse --short HEAD', returnStdout: true - ) + ).trim() + GIT_TAG = sh ( + script: 'git describe --tags --always --dirty=-dirty', + returnStdout: true + ).trim() container('maven') { stage('Build') { sh ''' -- 2.45.2