From 865ce09f54c72f64171a33e821ff97fe75b8aa6a Mon Sep 17 00:00:00 2001 From: AV Date: Thu, 25 Sep 2025 06:53:05 +0000 Subject: [PATCH 1/3] fix --- MODULE.bazel | 1 + images/default/Dockerfile | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index bb7f6296ef..af58db4543 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -103,6 +103,7 @@ http_file( # used in any part of the build other than as certificates present in images. http_file( name = "google_root_pem", + sha256 = "0d4b15a365e5158c1f9217b7827c5af8a9b86789e8cfbe21480a57c134fe9d01", urls = [ "https://pki.goog/roots.pem", ], diff --git a/images/default/Dockerfile b/images/default/Dockerfile index 76af482add..0c0aa65bb9 100644 --- a/images/default/Dockerfile +++ b/images/default/Dockerfile @@ -39,7 +39,18 @@ RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud google-cloud-sdk/install.sh --quiet && \ ln -s /google-cloud-sdk/bin/gcloud /usr/bin/gcloud -RUN add-apt-repository ppa:longsleep/golang-backports && apt update && apt install -y golang-go +ENV GO_VERSION 1.25.1 +ENV GO_DOWNLOAD_BASE_URL https://dl.google.com/go/ +RUN ARCH="$(uname -m)" && \ + case "$ARCH" in \ + x86_64) GO_ARCH="amd64" ;; \ + aarch64) GO_ARCH="arm64" ;; \ + *) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;; \ + esac && \ + GO_FILENAME="go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" && \ + GO_URL="${GO_DOWNLOAD_BASE_URL}${GO_FILENAME}" && \ + curl -sSL "${GO_URL}" | tar -xz -C /usr/local +ENV PATH=$PATH:/usr/local/go/bin # Download the official bazel binary. The APT repository isn't used because there is not packages for arm64. COPY bazelversion . From 82ec9462527151a22d35d2b81cd65f2449984765 Mon Sep 17 00:00:00 2001 From: AV Date: Thu, 25 Sep 2025 06:55:50 +0000 Subject: [PATCH 2/3] fix --- tools/defs.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/defs.bzl b/tools/defs.bzl index f4c3d76654..cdf0549b09 100644 --- a/tools/defs.bzl +++ b/tools/defs.bzl @@ -138,8 +138,8 @@ def go_imports(name, src, out): name = name, srcs = [src], outs = [out], - tools = ["@org_golang_x_tools//cmd/goimports:goimports"], - cmd = ("$(location @org_golang_x_tools//cmd/goimports:goimports) $(SRCS) > $@"), + tools = ["@org_golang_x_tools//cmd/goimports:goimports", "@go_sdk//:go"], + cmd = ("export PATH=$(dirname $(location @go_sdk//:go)):$PATH && $(location @org_golang_x_tools//cmd/goimports:goimports) $(SRCS) > $@"), ) def go_library(name, srcs, deps = [], imports = [], stateify = True, force_add_state_pkg = False, marshal = False, marshal_debug = False, nogo = True, **kwargs): From 57e35603a8d3067ffd4659cc861a06a4f7d5191d Mon Sep 17 00:00:00 2001 From: AV Date: Thu, 25 Sep 2025 07:02:35 +0000 Subject: [PATCH 3/3] fix --- tools/defs.bzl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/defs.bzl b/tools/defs.bzl index cdf0549b09..7362aca486 100644 --- a/tools/defs.bzl +++ b/tools/defs.bzl @@ -13,6 +13,7 @@ load("//tools/bazeldefs:platforms.bzl", _default_platform = "default_platform", load("//tools/bazeldefs:tags.bzl", _go_suffixes = "go_suffixes", _local_test_tags = "local_test_tags") load("//tools/go_marshal:defs.bzl", "go_marshal", "marshal_deps", "marshal_test_deps") load("//tools/go_stateify:defs.bzl", "go_stateify") +load("//tools/go_tool:defs.bzl", "go_tool") load("//tools/nogo:defs.bzl", "nogo_test") # Core rules. @@ -138,8 +139,11 @@ def go_imports(name, src, out): name = name, srcs = [src], outs = [out], - tools = ["@org_golang_x_tools//cmd/goimports:goimports", "@go_sdk//:go"], - cmd = ("export PATH=$(dirname $(location @go_sdk//:go)):$PATH && $(location @org_golang_x_tools//cmd/goimports:goimports) $(SRCS) > $@"), + tools = [ + "@org_golang_x_tools//cmd/goimports:goimports", + "//tools/go_tool:go", + ], + cmd = ("export PATH=$$(dirname $(execpath //tools/go_tool:go)):$$PATH && $(execpath @org_golang_x_tools//cmd/goimports:goimports) $(SRCS) > $@"), ) def go_library(name, srcs, deps = [], imports = [], stateify = True, force_add_state_pkg = False, marshal = False, marshal_debug = False, nogo = True, **kwargs): @@ -188,11 +192,6 @@ def go_library(name, srcs, deps = [], imports = [], stateify = True, force_add_s srcs = src_subset, imports = imports, package = full_pkg, - out = name + suffix + "_state_autogen_with_imports.go", - ) - go_imports( - name = name + suffix + "_state_autogen", - src = name + suffix + "_state_autogen_with_imports.go", out = name + suffix + "_state_autogen.go", ) all_srcs = all_srcs + [