From 82631b1b2240a19f47821add203e0a2d7697006d Mon Sep 17 00:00:00 2001
From: Julien Lind <julien.lind@elastic.co>
Date: Thu, 6 Mar 2025 12:31:39 +0100
Subject: [PATCH] Update pipeline.package.mbp.yml (#4555)

GVM is unable to install Go 1.24.0 on main due to a missing fix that landed in 0.5.1

(cherry picked from commit 20c2254c08e323d603901f529e13b26ba7ee5608)

# Conflicts:
#	.buildkite/pipeline.yml
#	.buildkite/scripts/common.sh
---
 .buildkite/pipeline.package.mbp.yml | 1 -
 .buildkite/pipeline.yml             | 3 +++
 .buildkite/scripts/common.sh        | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.package.mbp.yml b/.buildkite/pipeline.package.mbp.yml
index 9386c9d12..8faf5373f 100644
--- a/.buildkite/pipeline.package.mbp.yml
+++ b/.buildkite/pipeline.package.mbp.yml
@@ -2,7 +2,6 @@
 name: "fleet server package mbp"
 env:
   REPO: 'fleet-server'
-  SETUP_GVM_VERSION: 'v0.3.0'
   DOCKER_REGISTRY: "docker.elastic.co"
   IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2004"
   IMAGE_UBUNTU_ARM_64: "core-ubuntu-2004-aarch64"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4c308e574..8fe7c4582 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,7 +1,10 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 
 env:
+<<<<<<< HEAD
   SETUP_GVM_VERSION: "v0.5.0"
+=======
+>>>>>>> 20c2254 (Update pipeline.package.mbp.yml (#4555))
   DOCKER_COMPOSE_VERSION: "1.25.5"
   GO_AGENT_IMAGE: "golang:${GO_VERSION}"
 
diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh
index 5018d0210..21677c42c 100755
--- a/.buildkite/scripts/common.sh
+++ b/.buildkite/scripts/common.sh
@@ -43,7 +43,12 @@ with_go() {
     echo "Setting up the Go environment..."
     create_workspace
     check_platform_architeture
+<<<<<<< HEAD
     retry 5 curl -sL -o ${WORKSPACE}/gvm "https://github.com/andrewkroh/gvm/releases/download/${SETUP_GVM_VERSION}/gvm-${platform_type_lowercase}-${arch_type}"
+=======
+    SETUP_GVM_VERSION=v0.5.2
+    retry 5 curl -sL -o ${WORKSPACE}/gvm "https://github.com/andrewkroh/gvm/releases/download/${SETUP_GVM_VERSION}/gvm-${platform_type}-${arch_type}"
+>>>>>>> 20c2254 (Update pipeline.package.mbp.yml (#4555))
     chmod +x ${WORKSPACE}/gvm
     eval "$(gvm $(cat .go-version))"
     go version