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

Fixed command argument typo in pipeline.

Browse Source
This commit is contained in:
Harrison Deng 2022-05-12 14:27:11 -05:00
parent f1c96b02c0
commit 8d00aa9852
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

@ -9,7 +9,7 @@ pipeline {
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) { sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
sh "git fetch" sh "git fetch"
sh "git checkout -b latest-modpack" sh "git checkout -b latest-modpack"
sh "git merge develop --theirs" sh "git merge --strategy-option theirs develop"
sh "chmod u+x ./scripts/*.sh" sh "chmod u+x ./scripts/*.sh"
sh "./scripts/update_modpack.sh" sh "./scripts/update_modpack.sh"
} }