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

Added "live" branch to represent live server.

Browse Source
This commit is contained in:
Harrison Deng 2022-04-16 00:56:14 -05:00
parent 1113799a0f
commit ca1aa9fc8f
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

@ -13,10 +13,10 @@ pipeline {
branch '**/delta' branch '**/delta'
} }
steps { steps {
sh 'git checkout master' sh 'git checkout live'
sh 'git merge --strategy-option theirs origin/delta' sh 'git merge --strategy-option theirs origin/delta'
sshagent(['359ebf7c-e2b9-45ec-992c-ff8d5549deb6']) { sshagent(['359ebf7c-e2b9-45ec-992c-ff8d5549deb6']) {
sh 'git push origin master' sh 'git push origin live'
} }
} }
} }