[Buildkite] Use Go version from file (#581)

elastic · Aug 29, 2023 · 037631b · 037631b
1 parent 5cf4f70
commit 037631b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -6,6 +6,8 @@ source .buildkite/scripts/tooling.sh
 
 GITHUB_TOKEN_VAULT_PATH=kv/ci-shared/platform-ingest/github_token
 
+export GO_VERSION=$(cat .go-version)
+
 # Secrets must be redacted
 # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables
 

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -3,7 +3,6 @@
 env:
   SETUP_GVM_VERSION: 'v0.5.0' # https://github.com/andrewkroh/gvm/issues/44#issuecomment-1013231151
   SETUP_MAGE_VERSION: "latest"
-  GO_VERSION: "1.20.3"
   GO_LINUX_AGENT_IMAGE: "golang:${GO_VERSION}"
   GO_WINDOWS_AGENT_IMAGE: "family/ci-windows-2022"
 

diff --git a/.buildkite/scripts/run-win-tests.ps1 b/.buildkite/scripts/run-win-tests.ps1
@@ -8,7 +8,7 @@ function fixCRLF {
     git reset --quiet --hard
 }
 function withGolang($version) {
-    Write-Host "-- Install golang --"
+    Write-Host "-- Install golang $version --"
     choco install -y golang --version $version
     $env:ChocolateyInstall = Convert-Path "$((Get-Command choco).Path)\..\.."
     Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"