Skip to content

Commit 17e8def

Browse files
committed
Clean and archive only once.
1 parent 363ea96 commit 17e8def

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

Jenkinsfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ def test_with_torch(branch)
99
}
1010

1111
stage('Build + Torch ' + branch) {
12+
bat "\"${tool 'MSBuild'}msbuild\" Essentials.sln /p:Configuration=Release /p:Platform=x64 /t:Clean"
1213
// bat "\"${tool 'MSBuild'}msbuild\" Essentials.sln /p:Configuration=Release /p:Platform=x64 /t:TransformOnBuild"
1314
bat "\"${tool 'MSBuild'}msbuild\" Essentials.sln /p:Configuration=Release /p:Platform=x64"
1415
}
@@ -32,12 +33,6 @@ def test_with_torch(branch)
3233
])
3334
}
3435
*/
35-
36-
stage('Archive + Torch ' + branch) {
37-
bat "copy bin/x64/Release/Essentials.dll bin/x64/Release/Essentials-${branch}.dll"
38-
archiveArtifacts artifacts: "bin/x64/Release/Essentials-${branch}.dll", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true
39-
}
40-
4136
return true
4237
} catch (e) {
4338
return false
@@ -59,10 +54,14 @@ node {
5954
bat 'nuget restore Essentials.sln'
6055
}
6156

62-
bool resultMaster = test_with_torch("master")
63-
bool resultStaging = test_with_torch("staging")
64-
if (resultMaster || resultStaging)
57+
resultMaster = test_with_torch("master")
58+
resultStaging = test_with_torch("staging")
59+
if (resultMaster || resultStaging) {
6560
currentBuild.result = "SUCCESS"
61+
stage('Archive') {
62+
archiveArtifacts artifacts: "bin/x64/Release/Essentials.dll", caseSensitive: false, fingerprint: true, onlyIfSuccessful: true
63+
}
64+
}
6665
else
6766
currentBuild.result = "FAIL"
6867
}

0 commit comments

Comments
 (0)