Merge remote-tracking branch 'upstream/master' into sql-rows-affected

elastic · Jan 9, 2020 · 6d90ea3 · 6d90ea3
2 parents 5f36522 + 4b3f304
commit 6d90ea3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -167,9 +167,6 @@ pipeline {
           post {
             always {
               junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/build/junit-*.xml")
-              dir("${BASE_DIR}"){
-                bat script: 'scripts/jenkins/windows/uninstall-tools.bat', label: 'Uninstall tools'
-              }
               cleanWs(disableDeferredWipeout: true, notFailBuild: true)
             }
           }

diff --git a/scripts/jenkins/windows/install-tools.bat b/scripts/jenkins/windows/install-tools.bat
@@ -3,4 +3,7 @@
 ::
 
 choco config set cacheLocation %WORKSPACE%
-choco install golang --version %GO_VERSION% -y --no-progress
+:: Install latest as long as https://github.com/chocolatey/chocolatey.org/issues/803
+:: is not resolved.
+:: choco install golang --version %GO_VERSION% -y --no-progress
+choco install golang -y --no-progress
diff --git a/scripts/jenkins/windows/uninstall-tools.bat b/scripts/jenkins/windows/uninstall-tools.bat