Merge branch 'develop' into latest-modpack

2022-05-12 15:31:50 -05:00 · 2022-05-12 15:31:50 -05:00 · 5da7d6eec5
commit 5da7d6eec5
parent 7e457a3158 e19da4c362
1 changed files with 0 additions and 6 deletions
--- a/6
+++ b/6
@ -16,11 +16,6 @@ pipeline {
            }
        }
        stage("server launch test") {
-            when {
-                not {
-                    branch '**/latest-modpack'
-                }
-            }
            steps {
                sh 'echo "eula=true" > eula.txt'
                sh "chmod u+x ./run.sh"
@ -43,7 +38,6 @@ pipeline {
                    sh "git pull -X theirs origin latest-modpack"
                    sh "git push --set-upstream origin latest-modpack"
                }
-                sh "git checkout develop"
            }
        }
        stage("deploy") {