Skip to content

Commit

Permalink
Update pipeline.package.mbp.yml (#4555)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jlind23 authored and mergify[bot] committed Mar 6, 2025
1 parent 23f80b1 commit 7573a85
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 0 additions & 1 deletion .buildkite/pipeline.package.mbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -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"
DOCKER_REGISTRY: "docker.elastic.co"
DOCKER_IMAGE: "${DOCKER_REGISTRY}/observability-ci/fleet-server" # needs to rename for rollback
Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ with_go() {
echo "Setting up the Go environment..."
create_workspace
check_platform_architeture
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}"
chmod +x ${WORKSPACE}/gvm
eval "$(gvm $(cat .go-version))"
Expand Down

0 comments on commit 7573a85

Please sign in to comment.