ydeng/rsemcs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Jenkinsfile.

Browse Source
This commit is contained in:
Harrison Deng 2022-05-12 14:58:54 -05:00
parent 67af781e63
commit 8bbec1a94f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -9,7 +9,7 @@ pipeline {
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
sh "git fetch"
sh "git checkout -B latest-modpack"
sh "git merge --strategy-option theirs origin/develop"
sh "git merge -X theirs origin/develop"
sh "chmod u+x ./scripts/*.sh"
sh "./scripts/update_modpack.sh"
}
@ -35,6 +35,7 @@ pipeline {
sh "git add config/**"
sh "git commit -a -m 'Automatic integration of latest modpack.' && exit 0"
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
sh "git pull -X theirs"
sh "git push --set-upstream origin latest-modpack"
}
sh "git checkout develop"