If master, build against master. Else staging.

Equinox- · Equinox- · commit d286f1f1738b · 2017-09-01T11:15:49.000-07:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -55,12 +55,15 @@ node {
 		bat 'nuget restore Essentials.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/Essentials.dll", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true
+			archiveArtifacts artifacts: "bin/x64/Release/Concealment.dll", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true
 		}
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,15 @@ node {`
`55`	`55`	`bat 'nuget restore Essentials.sln'`
`56`	`56`	`}`
`57`	`57`
`58`		`- resultMaster = test_with_torch("master")`
`59`		`- resultStaging = test_with_torch("staging")`
`60`		`- if (resultMaster \|\| resultStaging) {`
	`58`	`+ if (env.BRANCH_NAME == "master") {`
	`59`	`+ result = test_with_torch("master")`
	`60`	`+ } else {`
	`61`	`+ result = test_with_torch("staging")`
	`62`	`+ }`
	`63`	`+ if (result) {`
`61`	`64`	`currentBuild.result = "SUCCESS"`
`62`	`65`	`stage('Archive') {`
`63`		`- archiveArtifacts artifacts: "bin/x64/Release/Essentials.dll", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true`
	`66`	`+ archiveArtifacts artifacts: "bin/x64/Release/Concealment.dll", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true`
`64`	`67`	`}`
`65`	`68`	`}`
`66`	`69`	`else`