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 15:12:45 -05:00
parent 8bbec1a94f
commit 88d3ada2fe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

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