Updated Jenkinsfile.

This commit is contained in:
Harrison Deng 2022-05-13 03:40:45 -05:00
parent bf8fdaaddc
commit dd9cc6f8b9

1
Jenkinsfile vendored
View File

@ -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"