Updated Jenkinsfile.
This commit is contained in:
parent
bf8fdaaddc
commit
dd9cc6f8b9
1
Jenkinsfile
vendored
1
Jenkinsfile
vendored
@ -35,6 +35,7 @@ pipeline {
|
|||||||
branch '**/sync-modpack'
|
branch '**/sync-modpack'
|
||||||
}
|
}
|
||||||
steps {
|
steps {
|
||||||
|
sh "git merge -X theirs sync-modpack"
|
||||||
sh "git add mods/**"
|
sh "git add mods/**"
|
||||||
sh "git add config/**"
|
sh "git add config/**"
|
||||||
sh "git clean -dfX"
|
sh "git clean -dfX"
|
||||||
|
Loading…
Reference in New Issue
Block a user