From c6b603a902d0449b54aac035e65e9297839b177a Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Thu, 12 May 2022 15:27:55 -0500 Subject: [PATCH 1/2] Removed unecessary git checkout in Jenkinsfile. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e3dc103..776546f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,6 @@ pipeline { sh "git pull -X theirs origin latest-modpack" sh "git push --set-upstream origin latest-modpack" } - sh "git checkout develop" } } stage("deploy") { From e19da4c36221c354de18743299a8394e400219d3 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Thu, 12 May 2022 15:31:23 -0500 Subject: [PATCH 2/2] Server launch test occurs on all branches. --- Jenkinsfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 776546f..95618a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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"