From 35f0dd8ec35c8bc3fc5fa78ac5850aa0814cd317 Mon Sep 17 00:00:00 2001 From: Kevin Minehart <5140827+kminehart@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:53:13 -0500 Subject: [PATCH] CI: remove ppcle64 and 390x from viceroy dpkg (#108866) * remove ppcle64 and 390x from viceroy dpkg * fix apt-get update * remove armel --- pkg/build/daggerbuild/backend/builder.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/build/daggerbuild/backend/builder.go b/pkg/build/daggerbuild/backend/builder.go index 9a27c60a8c0..4b49efa1ba9 100644 --- a/pkg/build/daggerbuild/backend/builder.go +++ b/pkg/build/daggerbuild/backend/builder.go @@ -69,7 +69,11 @@ func ViceroyContainer( container := d.Container(containerOpts).From(fmt.Sprintf("rfratto/viceroy:%s", viceroyVersion)) // Install Go manually, and install make, git, and curl from the package manager. - container = container.WithExec([]string{"apt-get", "update"}). + container = container. + WithExec([]string{"dpkg", "--remove-architecture", "ppc64el"}). + WithExec([]string{"dpkg", "--remove-architecture", "s390x"}). + WithExec([]string{"dpkg", "--remove-architecture", "armel"}). + WithExec([]string{"apt-get", "update", "-yq"}). WithExec([]string{"apt-get", "install", "-yq", "curl", "make", "git"}). WithExec([]string{"/bin/sh", "-c", fmt.Sprintf("curl -L %s | tar -C /usr/local -xzf -", goURL)}). WithEnvVariable("PATH", "/bin:/usr/bin:/usr/local/bin:/usr/local/go/bin:/usr/osxcross/bin")