From ed9d938cdb9bd9fb9dc0daabd5943c3117208f88 Mon Sep 17 00:00:00 2001 From: Matty Evans Date: Fri, 6 Dec 2024 19:36:25 +1000 Subject: [PATCH 1/2] build(prysm): update default build method to go --- .github/actions/deploy/action.yml | 2 +- .github/workflows/build-push-prysm.yml | 2 +- prysm/build_beacon.sh | 2 +- prysm/build_beacon_minimal.sh | 2 +- prysm/build_validator.sh | 2 +- prysm/build_validator_minimal.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml index 2fe20265..9196a457 100644 --- a/.github/actions/deploy/action.yml +++ b/.github/actions/deploy/action.yml @@ -39,7 +39,7 @@ inputs: build_method: description: Build method to use (go or bazel) type: string - default: bazel + default: go required: false # Secrets DOCKER_USERNAME: diff --git a/.github/workflows/build-push-prysm.yml b/.github/workflows/build-push-prysm.yml index 026176fc..1a61f55b 100644 --- a/.github/workflows/build-push-prysm.yml +++ b/.github/workflows/build-push-prysm.yml @@ -23,7 +23,7 @@ on: options: - bazel - go - default: bazel + default: go required: true jobs: diff --git a/prysm/build_beacon.sh b/prysm/build_beacon.sh index d9a33824..1f503685 100755 --- a/prysm/build_beacon.sh +++ b/prysm/build_beacon.sh @@ -13,7 +13,7 @@ else go install github.com/bazelbuild/bazelisk@latest fi -build_method=${build_method:-bazel} # Default to bazel if not set +build_method=${build_method:-go} # Default to go if not set case ${build_method} in "go") diff --git a/prysm/build_beacon_minimal.sh b/prysm/build_beacon_minimal.sh index 0faa1362..85ebdc07 100755 --- a/prysm/build_beacon_minimal.sh +++ b/prysm/build_beacon_minimal.sh @@ -13,7 +13,7 @@ else go install github.com/bazelbuild/bazelisk@latest fi -build_method=${build_method:-bazel} # Default to bazel if not set +build_method=${build_method:-go} # Default to go if not set case ${build_method} in "go") diff --git a/prysm/build_validator.sh b/prysm/build_validator.sh index 39f57a5b..c90e9968 100755 --- a/prysm/build_validator.sh +++ b/prysm/build_validator.sh @@ -13,7 +13,7 @@ else go install github.com/bazelbuild/bazelisk@latest fi -build_method=${build_method:-bazel} # Default to bazel if not set +build_method=${build_method:-go} # Default to go if not set case ${build_method} in "go") diff --git a/prysm/build_validator_minimal.sh b/prysm/build_validator_minimal.sh index 5d83fc4a..f85f49da 100755 --- a/prysm/build_validator_minimal.sh +++ b/prysm/build_validator_minimal.sh @@ -13,7 +13,7 @@ else go install github.com/bazelbuild/bazelisk@latest fi -build_method=${build_method:-bazel} # Default to bazel if not set +build_method=${build_method:-go} # Default to go if not set case ${build_method} in "go") From c4c1d92e075b833ae9b23c52331d9aa53da5e780 Mon Sep 17 00:00:00 2001 From: Matty Evans Date: Thu, 12 Dec 2024 12:37:16 +1000 Subject: [PATCH 2/2] refactor(prysm): force minimal builds to use bazel --- prysm/build_beacon_minimal.sh | 6 +++++- prysm/build_validator_minimal.sh | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/prysm/build_beacon_minimal.sh b/prysm/build_beacon_minimal.sh index 85ebdc07..cf9e06ca 100755 --- a/prysm/build_beacon_minimal.sh +++ b/prysm/build_beacon_minimal.sh @@ -13,7 +13,11 @@ else go install github.com/bazelbuild/bazelisk@latest fi -build_method=${build_method:-go} # Default to go if not set + +# Until this upstream issue (https://github.com/prysmaticlabs/prysm/issues/14703) is resolved, we +# need to build minimal using Bazel. +# build_method=${build_method:-go} +build_method=bazel case ${build_method} in "go") diff --git a/prysm/build_validator_minimal.sh b/prysm/build_validator_minimal.sh index f85f49da..eac94f8b 100755 --- a/prysm/build_validator_minimal.sh +++ b/prysm/build_validator_minimal.sh @@ -13,7 +13,10 @@ else go install github.com/bazelbuild/bazelisk@latest fi -build_method=${build_method:-go} # Default to go if not set +# Until this upstream issue (https://github.com/prysmaticlabs/prysm/issues/14703) is resolved, we +# need to build minimal using Bazel. +# build_method=${build_method:-go} +build_method=bazel case ${build_method} in "go")