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

Introduced separate branch for modpack integration.

Browse Source
This commit is contained in:
Harrison Deng 2022-05-12 14:25:06 -05:00
parent f01703edaa
commit f1c96b02c0
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Jenkinsfile vendored
View File

@ -6,8 +6,13 @@ pipeline {
branch '**/develop'
}
steps {
sh "chmod u+x ./scripts/*.sh"
sh "./scripts/update_modpack.sh"
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
sh "git fetch"
sh "git checkout -b latest-modpack"
sh "git merge develop --theirs"
sh "chmod u+x ./scripts/*.sh"
sh "./scripts/update_modpack.sh"
}
}
}
stage("server launch test") {
@ -25,7 +30,6 @@ pipeline {
branch '**/develop'
}
steps {
sh "git checkout develop"
sh "git clean -dfX"
sh "git add mods/**"
sh "git add config/**"
@ -33,6 +37,7 @@ pipeline {
sshagent(['108c5045-64d1-42a6-acd7-a39da5e096d1']) {
sh "git push"
}
sh "git checkout develop"
}
}
stage("deploy") {