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

Merge branch 'develop' into latest-modpack

Browse Source
This commit is contained in:
Harrison Deng 2022-05-12 15:31:50 -05:00
commit 5da7d6eec5
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -16,11 +16,6 @@ pipeline {
} }
} }
stage("server launch test") { stage("server launch test") {
when {
not {
branch '**/latest-modpack'
}
}
steps { steps {
sh 'echo "eula=true" > eula.txt' sh 'echo "eula=true" > eula.txt'
sh "chmod u+x ./run.sh" sh "chmod u+x ./run.sh"
@ -43,7 +38,6 @@ pipeline {
sh "git pull -X theirs origin latest-modpack" sh "git pull -X theirs origin latest-modpack"
sh "git push --set-upstream origin latest-modpack" sh "git push --set-upstream origin latest-modpack"
} }
sh "git checkout develop"
} }
} }
stage("deploy") { stage("deploy") {