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 20c2254)

# Conflicts:
#	.buildkite/pipeline.yml
#	.buildkite/scripts/common.sh

Author: jlind23

.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"

.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}"
 

.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