From d16f2052696f69f7a7e0b7688925698b5d7a5150 Mon Sep 17 00:00:00 2001 From: Sergio Andres Rodriguez Orama Date: Thu, 3 Sep 2026 15:54:42 -0400 Subject: [PATCH 1/3] Revert "tools/*/cw/Containerfile is now based on trixie" This reverts commit 3b6169065834c59703d439cb0b5695c0025b5df5. --- tools/buildutils/cw/Containerfile | 8 +++++++- tools/testutils/cw/Containerfile | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/buildutils/cw/Containerfile b/tools/buildutils/cw/Containerfile index 7827a94cf9f..7a75e0f7693 100644 --- a/tools/buildutils/cw/Containerfile +++ b/tools/buildutils/cw/Containerfile @@ -1,10 +1,16 @@ -FROM mirror.gcr.io/library/debian:13 AS base +FROM mirror.gcr.io/library/debian:bookworm-20250811 AS base ENV DEBIAN_FRONTEND=noninteractive RUN apt update -y && apt upgrade -y RUN apt install -y sudo devscripts +# Download newer version of golang with keep using bookworm for building debian +# packages. +RUN echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list +RUN apt update +RUN apt install -t bookworm-backports -y golang + COPY ./tools/buildutils/installbazel.sh /installbazel.sh RUN /installbazel.sh && rm /installbazel.sh diff --git a/tools/testutils/cw/Containerfile b/tools/testutils/cw/Containerfile index 99b8dfad03d..e0afd83c939 100644 --- a/tools/testutils/cw/Containerfile +++ b/tools/testutils/cw/Containerfile @@ -1,4 +1,4 @@ -FROM mirror.gcr.io/library/debian:13 AS base +FROM mirror.gcr.io/library/debian:bookworm-20250811 AS base ENV DEBIAN_FRONTEND=noninteractive ENV OVERRIDE_BAZEL_WRAPPER_DOWNLOAD_DIR=/tmp/cw_bazel From 1e25b44fabf5dfba9a14a4f982d15f158418d2ad Mon Sep 17 00:00:00 2001 From: Sergio Andres Rodriguez Orama Date: Thu, 3 Sep 2026 17:23:44 -0400 Subject: [PATCH 2/3] Bumping cache version to avoid debian-13 built artifacts. --- .config/cache-config.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/cache-config.env b/.config/cache-config.env index fa6b2be0b50..7b4578a8c94 100644 --- a/.config/cache-config.env +++ b/.config/cache-config.env @@ -1,3 +1,3 @@ -CACHE_VERSION=v2 +CACHE_VERSION=version-1.57-dev BAZEL_REMOTE_CACHE="https://storage.googleapis.com/android-cuttlefish-cache" From d202eeb95810414a746a5d43cd3ef0b521837bcd Mon Sep 17 00:00:00 2001 From: "A. Cody Schuffelen" Date: Thu, 3 Sep 2026 14:29:08 -0700 Subject: [PATCH 3/3] v1.57.1 minor version, migrate v1.57 builder back to debian 12 Import of https://www.github.com/google/android-cuttlefish/pull/3133 --- base/debian/changelog | 6 ++++++ container/debian/changelog | 6 ++++++ cuttlefish-integration-gigabyte-arm64/debian/changelog | 6 ++++++ frontend/debian/changelog | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/base/debian/changelog b/base/debian/changelog index 83cf1f837f6..a4d9f9bff08 100644 --- a/base/debian/changelog +++ b/base/debian/changelog @@ -1,3 +1,9 @@ +cuttlefish-common (1.57.1) unstable; urgency=medium + + * Revert "tools/*/cw/Containerfile is now based on trixie" by @ser-io in https://github.com/google/android-cuttlefish/pull/3133 + + -- Cody Schuffelen Thu, 03 Sep 2026 14:28:28 -0700 + cuttlefish-common (1.57.0) unstable; urgency=medium * Mark release 1.56.0 as unstable by @Databean in https://github.com/google/android-cuttlefish/pull/2767 diff --git a/container/debian/changelog b/container/debian/changelog index d2c1bb760d6..c5c5406b155 100644 --- a/container/debian/changelog +++ b/container/debian/changelog @@ -1,3 +1,9 @@ +cuttlefish-container (1.57.1) unstable; urgency=medium + + * Revert "tools/*/cw/Containerfile is now based on trixie" by @ser-io in https://github.com/google/android-cuttlefish/pull/3133 + + -- Cody Schuffelen Thu, 03 Sep 2026 14:28:16 -0700 + cuttlefish-container (1.57.0) unstable; urgency=medium * Mark release 1.56.0 as unstable by @Databean in https://github.com/google/android-cuttlefish/pull/2767 diff --git a/cuttlefish-integration-gigabyte-arm64/debian/changelog b/cuttlefish-integration-gigabyte-arm64/debian/changelog index dbfaa432bfa..252f7cca447 100644 --- a/cuttlefish-integration-gigabyte-arm64/debian/changelog +++ b/cuttlefish-integration-gigabyte-arm64/debian/changelog @@ -1,3 +1,9 @@ +cuttlefish-integration-gigabyte-arm64 (1.57.1) unstable; urgency=medium + + * Revert "tools/*/cw/Containerfile is now based on trixie" by @ser-io in https://github.com/google/android-cuttlefish/pull/3133 + + -- Cody Schuffelen Thu, 03 Sep 2026 14:28:00 -0700 + cuttlefish-integration-gigabyte-arm64 (1.57.0) unstable; urgency=medium * Start development on 1.57 by @Databean in https://github.com/google/android-cuttlefish/pull/2768 diff --git a/frontend/debian/changelog b/frontend/debian/changelog index 8303bb8dc92..92cd3942123 100644 --- a/frontend/debian/changelog +++ b/frontend/debian/changelog @@ -1,3 +1,9 @@ +cuttlefish-frontend (1.57.1) unstable; urgency=medium + + * Revert "tools/*/cw/Containerfile is now based on trixie" by @ser-io in https://github.com/google/android-cuttlefish/pull/3133 + + -- Cody Schuffelen Thu, 03 Sep 2026 14:27:33 -0700 + cuttlefish-frontend (1.57.0) unstable; urgency=medium * Mark release 1.56.0 as unstable by @Databean inhttps://github.com/google/android-cuttlefish/pull/2767