Updated Jenkinsfile.
This commit is contained in:
parent
7831e81d8f
commit
bf8fdaaddc
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -35,9 +35,9 @@ pipeline {
|
|||||||
branch '**/sync-modpack'
|
branch '**/sync-modpack'
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
sh "git clean -dfX"
|
|
||||||
sh "git add mods/**"
|
sh "git add mods/**"
|
||||||
sh "git add config/**"
|
sh "git add config/**"
|
||||||
|
sh "git clean -dfX"
|
||||||
sh returnStatus: true, script: "git commit -m 'Automatic integration of latest modpack.'"
|
sh returnStatus: true, script: "git commit -m 'Automatic integration of latest modpack.'"
|
||||||
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
|
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
|
||||||
sh "git pull -X theirs origin develop"
|
sh "git pull -X theirs origin develop"
|
||||||
|
Loading…
Reference in New Issue
Block a user