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

Fixed Jenkinsfile "commit changes" stage.

Browse Source
This commit is contained in:
Harrison Deng 2022-05-13 03:13:29 -05:00
parent 93609893eb
commit 3633c4cee8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -8,7 +8,7 @@ pipeline {
steps { steps {
sshagent(['eb018bad-5d56-4306-a006-60fb7cf194aa']) { sshagent(['eb018bad-5d56-4306-a006-60fb7cf194aa']) {
sh "git fetch" sh "git fetch"
sh "git checkout -B origin/develop" sh "git checkout origin/develop"
sh "git merge -X theirs origin/sync-modpack" sh "git merge -X theirs origin/sync-modpack"
sh "chmod u+x ./scripts/*.sh" sh "chmod u+x ./scripts/*.sh"
sh "./scripts/update_modpack.sh" sh "./scripts/update_modpack.sh"
@ -41,7 +41,7 @@ pipeline {
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 origin develop" sh "git pull -X theirs origin develop"
sh "git push --set-upstream origin develop" sh "git push --set-upstream origin origin/develop"
} }
} }
} }