Skip to content

Commit a4f59b9

Browse files
authored
ci: bump gvm to v0.5.2 (#5432)
1 parent 1d4ded5 commit a4f59b9

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.buildkite/scripts/common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if [[ -z "${SETUP_MAGE_VERSION-""}" ]]; then
1010
SETUP_MAGE_VERSION="1.15.0"
1111
fi
1212
if [[ -z "${SETUP_GVM_VERSION-""}" ]]; then
13-
SETUP_GVM_VERSION="v0.5.0" # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
13+
SETUP_GVM_VERSION="v0.5.2" # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
1414
fi
1515
BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
1616
export BEAT_VERSION

.ci/scripts/install-go.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ mkdir %WORKSPACE%\bin
1414
IF EXIST "%PROGRAMFILES(X86)%" (
1515
REM Force the gvm installation.
1616
SET GVM_BIN=gvm.exe
17-
curl -L -o %WORKSPACE%\bin\gvm.exe https://github.com/andrewkroh/gvm/releases/download/v0.3.0/gvm-windows-amd64.exe
17+
curl -L -o %WORKSPACE%\bin\gvm.exe https://github.com/andrewkroh/gvm/releases/download/v0.5.2/gvm-windows-amd64.exe
1818
IF ERRORLEVEL 1 (
1919
REM gvm installation has failed.
2020
del bin\gvm.exe /s /f /q
2121
exit /b 1
2222
)
2323
) ELSE (
2424
REM Windows 7 workers got a broken gvm installation.
25-
curl -L -o %WORKSPACE%\bin\gvm.exe https://github.com/andrewkroh/gvm/releases/download/v0.3.0/gvm-windows-386.exe
25+
curl -L -o %WORKSPACE%\bin\gvm.exe https://github.com/andrewkroh/gvm/releases/download/v0.5.2/gvm-windows-386.exe
2626
IF ERRORLEVEL 1 (
2727
REM gvm installation has failed.
2828
del bin\gvm.exe /s /f /q

.ci/scripts/install-go.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fi
3535
echo "UNMET DEP: Installing Go"
3636
mkdir -p "${HOME}/bin"
3737

38-
curl -sSLo "${GVM_CMD}" "https://github.com/andrewkroh/gvm/releases/download/v0.3.0/gvm-${OS}-${GVM_ARCH_SUFFIX}"
38+
curl -sSLo "${GVM_CMD}" "https://github.com/andrewkroh/gvm/releases/download/v0.5.2/gvm-${OS}-${GVM_ARCH_SUFFIX}"
3939
chmod +x "${GVM_CMD}"
4040

4141
${GVM_CMD} "${GO_VERSION}" |cut -d ' ' -f 2|tr -d '\"' > ${PROPERTIES_FILE}

dev-tools/vagrant_scripts/unixProvision.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function gvmProvision () {
1212
echo "in gvmProvision: $ARCH / $OS"
1313
mkdir -p ~/bin
1414
if [ ! -e "~/bin/gvm" ]; then
15-
curl -sL -o ~/bin/gvm https://github.com/andrewkroh/gvm/releases/download/v0.3.0/gvm-$OS-$ARCH
15+
curl -sL -o ~/bin/gvm https://github.com/andrewkroh/gvm/releases/download/v0.5.2/gvm-$OS-$ARCH
1616
chmod +x ~/bin/gvm
1717
~/bin/gvm $GO_VERSION
1818
echo 'export GOPATH=$HOME/go' >> ~/.bash_profile

dev-tools/vagrant_scripts/winProvision.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if (-Not (Test-Path $gopath_beats)) {
1313
if (-Not (Get-Command "gvm" -ErrorAction SilentlyContinue)) {
1414
echo "Installing gvm to manage go version"
1515
[Net.ServicePointManager]::SecurityProtocol = "tls12"
16-
Invoke-WebRequest -URI https://github.com/andrewkroh/gvm/releases/download/v0.3.0/gvm-windows-amd64.exe -Outfile C:\\Windows\\System32\\gvm.exe
16+
Invoke-WebRequest -URI https://github.com/andrewkroh/gvm/releases/download/v0.5.2/gvm-windows-amd64.exe -Outfile C:\\Windows\\System32\\gvm.exe
1717
C:\\Windows\\System32\\gvm.exe --format=powershell $go_version | Invoke-Expression
1818
go version
1919

0 commit comments

Comments
 (0)