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-13 01:58:36 -05:00
parent 0cf95dbd77
commit 59741ad3db
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

@ -6,7 +6,7 @@ pipeline {
branch '**/develop' branch '**/develop'
} }
steps { steps {
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { sshagent(['eb018bad-5d56-4306-a006-60fb7cf194aa']) {
sh "git fetch" sh "git fetch"
sh "git checkout -B latest-modpack" sh "git checkout -B latest-modpack"
sh "git merge -X theirs origin/develop" sh "git merge -X theirs origin/develop"