[CI] bump gvm version and use the binary (elastic#24571)

narph · Mar 17, 2021 · 38f2876 · 38f2876
1 parent b7b2a16
commit 38f2876
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.ci/scripts/install-go.sh b/.ci/scripts/install-go.sh
@@ -33,9 +33,9 @@ fi
 echo "UNMET DEP: Installing Go"
 mkdir -p "${HOME}/bin"
 
-curl -sSLo "${GVM_CMD}" "https:/andrewkroh/gvm/releases/download/v0.2.2/gvm-${OS}-${GVM_ARCH_SUFFIX}"
+curl -sSLo "${GVM_CMD}" "https:/andrewkroh/gvm/releases/download/v0.3.0/gvm-${OS}-${GVM_ARCH_SUFFIX}"
 chmod +x "${GVM_CMD}"
 
-gvm ${GO_VERSION}|cut -d ' ' -f 2|tr -d '\"' > ${PROPERTIES_FILE}
+${GVM_CMD} "${GO_VERSION}" |cut -d ' ' -f 2|tr -d '\"' > ${PROPERTIES_FILE}
 
-eval $(gvm ${GO_VERSION})
+eval "$("${GVM_CMD}" "${GO_VERSION}")"
diff --git a/.ci/scripts/install-tools.bat b/.ci/scripts/install-tools.bat
@@ -17,14 +17,14 @@ mkdir %WORKSPACE%\bin
 IF EXIST "%PROGRAMFILES(X86)%" (
  REM Force the gvm installation.
  SET GVM_BIN=gvm.exe
- curl -L -o %WORKSPACE%\bin\gvm.exe https:/andrewkroh/gvm/releases/download/v0.2.4/gvm-windows-amd64.exe
+ curl -L -o %WORKSPACE%\bin\gvm.exe https:/andrewkroh/gvm/releases/download/v0.3.0/gvm-windows-amd64.exe
  IF ERRORLEVEL 1 (
  REM gvm installation has failed.
  exit /b 1
  )
 ) ELSE (
  REM Windows 7 workers got a broken gvm installation.
- curl -L -o %WORKSPACE%\bin\gvm.exe https:/andrewkroh/gvm/releases/download/v0.2.4/gvm-windows-386.exe
+ curl -L -o %WORKSPACE%\bin\gvm.exe https:/andrewkroh/gvm/releases/download/v0.3.0/gvm-windows-386.exe
  IF ERRORLEVEL 1 (
  REM gvm installation has failed.
  exit /b 1

diff --git a/Vagrantfile b/Vagrantfile
@@ -44,7 +44,7 @@ if (-Not (Test-Path $gopath_beats)) {
 if (-Not (Get-Command "gvm" -ErrorAction SilentlyContinue)) {
  echo "Installing gvm to manage go version"
  [Net.ServicePointManager]::SecurityProtocol = "tls12"
- Invoke-WebRequest -URI https:/andrewkroh/gvm/releases/download/v0.2.2/gvm-windows-amd64.exe -Outfile C:\\Windows\\System32\\gvm.exe
+ Invoke-WebRequest -URI https:/andrewkroh/gvm/releases/download/v0.3.0/gvm-windows-amd64.exe -Outfile C:\\Windows\\System32\\gvm.exe
  C:\\Windows\\System32\\gvm.exe --format=powershell #{GO_VERSION} | Invoke-Expression
  go version
 
@@ -119,7 +119,7 @@ def linuxGvmProvision(arch="amd64")
  return <<SCRIPT
 mkdir -p ~/bin
 if [ ! -e "~/bin/gvm" ]; then
- curl -sL -o ~/bin/gvm https:/andrewkroh/gvm/releases/download/v0.2.2/gvm-linux-#{arch}
+ curl -sL -o ~/bin/gvm https:/andrewkroh/gvm/releases/download/v0.3.0/gvm-linux-#{arch}
  chmod +x ~/bin/gvm
  ~/bin/gvm #{GO_VERSION}
  echo 'export GOPATH=$HOME/go' >> ~/.bash_profile