Merge pull request docker#26 from StefanScherer/jenkins-tag-name

Use Jenkins variable TAG_NAME
StefanScherer · Oct 23, 2019 · 6ef4003 · 6ef4003
2 parents 594e6e4 + 0255a6f
commit 6ef4003
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
               NugetAPIKey = credentials('nuget-api-key')
             }
             steps {
-                bat 'docker run --rm -v %cd%:C:/work -w C:/work/src -e NugetAPIKey mcr.microsoft.com/dotnet/framework/sdk:4.8-20190910-windowsservercore-ltsc2019 powershell -File build.ps1 -Target Nuget-push'
+                bat 'docker run --rm -v %cd%:C:/work -w C:/work/src -e NugetAPIKey -e TAG_NAME mcr.microsoft.com/dotnet/framework/sdk:4.8-20190910-windowsservercore-ltsc2019 powershell -File build.ps1 -Target Nuget-push'
             }
         }
     }

diff --git a/src/build.cake b/src/build.cake
@@ -41,8 +41,8 @@ Task("Nuget-pack")
   .IsDependentOn("Nuget-Restore")
   .Does(()=>{
     var version = "0.1.0";
-    if(BuildSystem.AppVeyor.Environment.Repository.Tag.IsTag){
-      version = BuildSystem.AppVeyor.Environment.Repository.Tag.Name;
+    if(HasEnvironmentVariable("TAG_NAME")){
+      version = EnvironmentVariable("TAG_NAME");
     }
     var settings = new DotNetCorePackSettings
      {
@@ -58,7 +58,7 @@ Task("Nuget-pack")
 Task("Nuget-push")
 .IsDependentOn("Nuget-pack")
 .Does(()=>{
-  if(!BuildSystem.AppVeyor.Environment.Repository.Tag.IsTag){
+  if(!HasEnvironmentVariable("TAG_NAME")){
     return;
   }
    // Get the paths to the packages.