From 01c36ad550c46e1eaf9ecf8d275364746ea13ab9 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Mon, 10 Jan 2022 04:26:13 -0600 Subject: [PATCH 1/3] Updated version number for next patch. --- server_ver.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_ver.groovy b/server_ver.groovy index a57b60e..df43c77 100755 --- a/server_ver.groovy +++ b/server_ver.groovy @@ -1,3 +1,3 @@ env.VER_MAJOR=0 env.VER_MINOR=0 -env.VER_PATCH=9 +env.VER_PATCH=10 From 88ed1c6bc8db54695954b9c00ccf29be9ce92666 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Mon, 10 Jan 2022 05:02:03 -0600 Subject: [PATCH 2/3] Jenkins pipeline now updates version before queueing. Undid previous version increment to account change in order of operation. --- Jenkinsfile | 22 +++++++++++----------- server_ver.groovy | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b14ab45..50029a9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,6 +19,17 @@ pipeline { sh 'git reset --hard' } } + stage('update') { + steps { + load './server_ver.groovy' + sh 'git checkout delta' + sh 'sed -i "s/env.VER_PATCH=$VER_PATCH/env.VER_PATCH=$((VER_PATCH + 1))/" ./server_ver.groovy' + sh 'git commit -am "Updated version number for next patch."' + sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) { + sh 'git push origin delta' + } + } + } stage('queue') { steps { load './server_ver.groovy' @@ -40,16 +51,5 @@ pipeline { } } } - stage('update') { - steps { - load './server_ver.groovy' - sh 'git checkout delta' - sh 'sed -i "s/env.VER_PATCH=$VER_PATCH/env.VER_PATCH=$((VER_PATCH + 1))/" ./server_ver.groovy' - sh 'git commit -am "Updated version number for next patch."' - sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) { - sh 'git push origin delta' - } - } - } } } diff --git a/server_ver.groovy b/server_ver.groovy index df43c77..a57b60e 100755 --- a/server_ver.groovy +++ b/server_ver.groovy @@ -1,3 +1,3 @@ env.VER_MAJOR=0 env.VER_MINOR=0 -env.VER_PATCH=10 +env.VER_PATCH=9 From a69312c92e41a5f7fe8b8907a71b82dac70f0a3f Mon Sep 17 00:00:00 2001 From: Jenkins Date: Mon, 10 Jan 2022 05:03:58 -0600 Subject: [PATCH 3/3] Updated version number for next patch. --- server_ver.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_ver.groovy b/server_ver.groovy index a57b60e..df43c77 100755 --- a/server_ver.groovy +++ b/server_ver.groovy @@ -1,3 +1,3 @@ env.VER_MAJOR=0 env.VER_MINOR=0 -env.VER_PATCH=9 +env.VER_PATCH=10