Use GoTool task for selecting Go version (#398)

Azure · May 18, 2020 · c61a4e1 · c61a4e1
1 parent 7221bd0
commit c61a4e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml
@@ -22,11 +22,9 @@ jobs:
         Linux_Go113:
           vm.image: 'ubuntu-18.04'
           go.version: '1.13'
-          GOROOT: '/usr/local/go$(go.version)'
         Linux_Go114:
           vm.image: 'ubuntu-18.04'
           go.version: '1.14'
-          GOROOT: '/usr/local/go$(go.version)'
 
     pool:
       vmImage: '$(vm.image)'
@@ -54,10 +52,11 @@ jobs:
           git diff --staged -w 1>&2
         displayName: 'Regenerate Autorest Tests'
         failOnStderr: true
-      - script: |
-          set -e
-          echo '##vso[task.prependpath]$(GOROOT)/bin'
-        displayName: 'Create Go Workspace'
+
+      - task: GoTool@0
+        inputs:
+          version: '$(go.version)'
+        displayName: "Select Go Version"
 
       - script: |
           set -e

diff --git a/eng/pipelines/publish-dev-release.yml b/eng/pipelines/publish-dev-release.yml
@@ -5,7 +5,6 @@ variables:
   NodeVersion: '12.x'
   goTestPath: '$(system.defaultWorkingDirectory)/test'
   GOBIN: '$(system.defaultWorkingDirectory)/bin/go'
-  GOROOT: '/usr/local/go1.14'
 
 pool:
   vmImage: 'ubuntu-18.04'
@@ -33,10 +32,11 @@ steps:
       git diff --staged -w 1>&2
     displayName: 'Regenerate Autorest Tests'
     failOnStderr: true
-  - script: |
-      set -e
-      echo '##vso[task.prependpath]$(GOROOT)/bin'
-    displayName: 'Create Go Workspace'
+
+  - task: GoTool@0
+    inputs:
+      version: '1.14'
+    displayName: "Select Go Version"
 
   - script: |
       set -e