From 7ec1a49615e906d158a95d3e2b0e188c10692319 Mon Sep 17 00:00:00 2001 From: Westin Miller Date: Fri, 1 Sep 2017 11:11:07 -0700 Subject: [PATCH] Build against master if master, else staging. --- Jenkinsfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1be6957..952f992 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,9 +55,12 @@ node { bat 'nuget restore Concealment.sln' } - resultMaster = test_with_torch("master") - resultStaging = test_with_torch("staging") - if (resultMaster || resultStaging) { + if (env.BRANCH_NAME == "master") { + result = test_with_torch("master") + } else { + result = test_with_torch("staging") + } + if (result) { currentBuild.result = "SUCCESS" stage('Archive') { archiveArtifacts artifacts: "bin/x64/Release/Concealment.dll", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true