Removed version tagging.
Potentially to be reimplemented in the future.
This commit is contained in:
parent
704692a449
commit
a2df6a26eb
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -21,7 +21,6 @@ pipeline {
|
|||||||
}
|
}
|
||||||
stage('queue') {
|
stage('queue') {
|
||||||
steps {
|
steps {
|
||||||
load './server_ver.groovy'
|
|
||||||
sh 'git checkout master'
|
sh 'git checkout master'
|
||||||
|
|
||||||
sh 'git reset --hard origin/master'
|
sh 'git reset --hard origin/master'
|
||||||
@ -32,7 +31,6 @@ pipeline {
|
|||||||
sh 'git clean -fd'
|
sh 'git clean -fd'
|
||||||
|
|
||||||
sh 'git merge --strategy-option theirs origin/delta'
|
sh 'git merge --strategy-option theirs origin/delta'
|
||||||
sh 'git tag -a "L$VER_MAJOR.$VER_MINOR.$VER_PATCH" -m "Automatic publish performed by Jenkins."'
|
|
||||||
sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
|
sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
|
||||||
sh 'git push origin master'
|
sh 'git push origin master'
|
||||||
sh 'git push origin --tags'
|
sh 'git push origin --tags'
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
env.VER_MAJOR=0
|
|
||||||
env.VER_MINOR=0
|
|
||||||
env.VER_PATCH=16
|
|
Loading…
Reference in New Issue
Block a user