Nuke staging

Author: Equinox-

Jenkinsfile

@@ -59,11 +59,10 @@ node {
 
 	if (env.BRANCH_NAME == "master") {
 		buildMode = "Release"
-		result = test_with_torch("master")
 	} else {
 		buildMode = "Debug"
-		result = test_with_torch("staging")
 	}
+	result = test_with_torch("master")
 	if (result) {
 		currentBuild.result = "SUCCESS"
 		stage('Archive') {
@@ -83,18 +82,6 @@ node {
 			powershell "Add-Type -Assembly System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::CreateFromDirectory(\"\$PWD\\${packageDir}\", \"\$PWD\\${zipFile}\")"
 			archiveArtifacts artifacts: zipFile, caseSensitive: false, onlyIfSuccessful: true
 		}
-
-		if (env.BRANCH_NAME == "master") {
-			gitVersion = bat(returnStdout: true, script: "@git describe --tags").trim()
-			gitSimpleVersion = bat(returnStdout: true, script: "@git describe --tags --abbrev=0").trim()
-			if (gitVersion == gitSimpleVersion) {
-				stage('Release') {
-					withCredentials([usernamePassword(credentialsId: 'torch-github', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
-						powershell "& ./Jenkins/release.ps1 \"https://api.github.com/repos/TorchAPI/Essentials/\" \"$gitSimpleVersion\" \"$USERNAME:$PASSWORD\" @(\"bin/essentials.zip\")"
-					}
-				}
-			}
-		}
 	}
 	else
 		currentBuild.result = "FAIL"

Versioning/version.ps1

@@ -1,20 +1,17 @@
+$buildSalt = $Env:BUILD_NUMBER
 $gitVersion = git describe --tags
 $gitSimpleVersion = git describe --tags --abbrev=0
-if ($gitSimpleVersion.Equals($gitVersion)) {
-	$buildSalt = 0
-} else {
-	$gitLatestCommit = git rev-parse --short HEAD
-	$buildSalt = [System.Numerics.BigInteger]::Abs([System.Numerics.BigInteger]::Parse($gitLatestCommit, [System.Globalization.NumberStyles]::HexNumber) % 16383) + 1
-}
-$dotNetVersion = echo $gitSimpleVersion | Select-String -Pattern "([0-9]+)\.([0-9]+)\.([0-9]+)" | % {$_.Matches} | %{$_.Groups[1].Value+"."+$_.Groups[2].Value+"."+$_.Groups[3].Value+".$buildSalt"}
+$simpleVersionStandard = echo $gitSimpleVersion | Select-String -Pattern "([0-9]+)\.([0-9]+)\.([0-9]+)" | % {$_.Matches} | %{$_.Groups[1].Value+"."+$_.Groups[2].Value+"."+$_.Groups[3].Value}
+$dotNetVersion = "$simpleVersionStandard.$buildSalt"
+$infoVersion = "$gitVersion" -replace "([0-9]+)\.([0-9]+)\.([0-9]+)","$dotNetVersion"
 
 $fileContent = @"
 using System.Reflection;
 
 [assembly: AssemblyVersion("$dotNetVersion")]
-[assembly: AssemblyInformationalVersion("$gitVersion")]
+[assembly: AssemblyInformationalVersion("$infoVersion")]
 "@
 
 echo $fileContent | Set-Content "$PSScriptRoot/AssemblyVersion.cs"
 
-echo "$gitVersion / $dotNetVersion"
+echo "$infoVersion"