Merge pull request #102 from ethanmoffat/git-tag-fix

Use same method of setting tag as etheos repo
ethanmoffat · Feb 3, 2022 · c0ca597 · c0ca597
2 parents bd28c3e + 52b0753
commit c0ca597
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -37,7 +37,7 @@ jobs:
     displayName: Build solution EndlessClient.sln
     inputs:
       solution: $(BuildParameters.solution)
-      vsVersion: 16.0
+      vsVersion: "16.0"
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
       maximumCpuCount: true
@@ -52,36 +52,31 @@ jobs:
       diagnosticsEnabled: True
   - task: CopyFiles@2
     displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)\EndlessClient'
-    condition: succeededOrFailed()
     inputs:
       SourceFolder: $(System.DefaultWorkingDirectory)
       Contents: bin\$(BuildConfiguration)\**
       TargetFolder: $(Build.ArtifactStagingDirectory)\EndlessClient
   - task: CopyFiles@2
     displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)\EOBot'
-    condition: succeededOrFailed()
     inputs:
       SourceFolder: $(System.DefaultWorkingDirectory)
       Contents: bin\utils\EOBot\$(BuildConfiguration)\**
       TargetFolder: $(Build.ArtifactStagingDirectory)\EOBot
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: EndlessClient'
-    condition: succeededOrFailed()
     inputs:
       PathtoPublish: $(Build.ArtifactStagingDirectory)\EndlessClient
       ArtifactName: EndlessClient
       TargetPath: '$(Build.DefinitionName)\$(Build.BuildNumber)'
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: EOBot'
-    condition: succeededOrFailed()
     inputs:
       PathtoPublish: $(Build.ArtifactStagingDirectory)\EOBot
       ArtifactName: EOBot
       TargetPath: '$(Build.DefinitionName)\$(Build.BuildNumber)'
-  - task: CmdLine@2
+  - script: |
+      git tag build/$(Build.BuildNumber)
+      git push origin build/$(Build.BuildNumber)
+    workingDirectory:  $(Build.SourcesDirectory)
     displayName: Tag sources on CI/Manual builds
     condition: or(eq(variables['build.reason'], 'IndividualCI'), eq(variables['build.reason'], 'Manual'))
-    inputs:
-      script: >-
-        git tag build/$(Build.BuildNumber)
-        git push origin build/$(Build.BuildNumber)