GH-1927 - revert to previous behaviour

minor changes to tasks names displayed in AzurePipelines
(build) fix the PR build

Author: artur-stolear-technosoft

build/stages/artifacts-test.yml

@@ -19,4 +19,4 @@ jobs:
       path: $(Build.SourcesDirectory)
       artifact: storage
   - script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Artifacts-Test --docker_distro=$(DISTRO) --docker_dotnetversion=$(DOTNET_VERSION)
-    displayName: 'Docker Test Artifacts'
+    displayName: '[Docker Test Artifacts]'

build/stages/build.yml

@@ -7,7 +7,7 @@ steps:
     versionSpec: '>= 2.5'
     addToPath: true
 - script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Pack
-  displayName: 'Cake build & pack'
+  displayName: '[Cake build & pack]'
 - publish: $(System.DefaultWorkingDirectory)
   displayName: 'Upload pipeline artifacts'
   condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))

build/stages/docker.yml

@@ -19,7 +19,7 @@ jobs:
       path: $(Build.SourcesDirectory)
       artifact: storage
   - script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Publish-DockerHub --docker_distro=$(DISTRO) --docker_dotnetversion=$(DOTNET_VERSION)
-    displayName: 'Docker build'
+    displayName: '[Docker build]'
     env:
       DOCKER_USERNAME: $(DOCKER_USERNAME)
       DOCKER_PASSWORD: $(DOCKER_PASSWORD)

build/stages/publish.yml

@@ -13,7 +13,7 @@ steps:
     path: $(Build.SourcesDirectory)
     artifact: storage
 - script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Publish
-  displayName: 'Publish'
+  displayName: '[Publish]'
   env:
     GITHUB_TOKEN: $(GITHUB_TOKEN)
     NUGET_API_KEY: $(NUGET_API_KEY)

build/stages/release.yml

@@ -7,6 +7,6 @@ steps:
     path: $(Build.SourcesDirectory)
     artifact: storage
 - script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Release
-  displayName: 'Release'
+  displayName: '[Release]'
   env:
-    GITHUB_TOKEN: $(GITHUB_TOKEN)
+    GITHUB_TOKEN: $(GITHUB_TOKEN)

build/stages/test.yml

@@ -1,7 +1,7 @@
 steps:
 - template: common-steps.yml
 - script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Test
-  displayName: 'Run Test'
+  displayName: '[Run Test]'
   env:
     ENABLED_UNIT_TESTS: $(ENABLED_UNIT_TESTS)
     CODECOV_TOKEN: $(CODECOV_TOKEN)

build/utils/docker.cake

@@ -122,6 +122,14 @@ DockerContainerRunSettings GetDockerRunSettings(BuildParameters parameters)
         }
     };
 
+    if (parameters.IsRunningOnAzurePipeline) {
+        settings.Env = new[]
+        {
+            "TF_BUILD=true",
+            $"BUILD_SOURCEBRANCH={Context.EnvironmentVariable("BUILD_SOURCEBRANCH")}"
+        };
+    }
+
     return settings;
 }
 

src/GitVersionCore/BuildServers/AzurePipelines.cs

@@ -27,11 +27,6 @@ public override string[] GenerateSetParameterMessage(string name, string value)
 
         public override string GetCurrentBranch(bool usingDynamicRepos)
         {
-            var pullRequestBranchName = Environment.GetEnvironmentVariable("SYSTEM_PULLREQUEST_SOURCEBRANCH");
-            if (!string.IsNullOrWhiteSpace(pullRequestBranchName))
-            {
-                return pullRequestBranchName;
-            }
             return Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH");
         }
 
@@ -53,7 +48,7 @@ public override string GenerateSetVersionMessage(VersionVariables variables)
                 var buildNumber = variables.FullSemVer.EndsWith("+0")
                                 ? variables.FullSemVer.Substring(0, variables.FullSemVer.Length - 2)
                                 : variables.FullSemVer;
-                
+
                 return $"##vso[build.updatebuildnumber]{buildNumber}";
             }