From 2945667dcc7b655fc3bf044f04b69f6cbdf31b69 Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Thu, 29 Jan 2026 15:46:15 +0100
Subject: [PATCH] [experimental] nit: try to speed up apt-install (#10163)

---
 .github/workflows/shell-tool-mcp.yml | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/shell-tool-mcp.yml b/.github/workflows/shell-tool-mcp.yml
index 57bfdd5f5b..3273bb47bc 100644
--- a/.github/workflows/shell-tool-mcp.yml
+++ b/.github/workflows/shell-tool-mcp.yml
@@ -248,8 +248,32 @@ jobs:
         run: |
           set -euo pipefail
           if command -v apt-get >/dev/null 2>&1; then
-            apt-get update
-            DEBIAN_FRONTEND=noninteractive apt-get install -y git build-essential bison autoconf gettext
+            # On Ubuntu ARM containers, apt metadata for universe/multiverse is large and
+            # can make `apt-get update` very slow. We only need packages from `main`, so
+            # trim sources to `main` for faster, more reliable updates.
+            if [[ "${{ matrix.target }}" == "aarch64-unknown-linux-musl" ]] && [[ -f /etc/os-release ]]; then
+              . /etc/os-release
+              if [[ "${ID-}" == "ubuntu" ]]; then
+                codename="${VERSION_CODENAME:-}"
+                if [[ -n "$codename" ]]; then
+                  printf '%s\n' \
+                    "deb http://ports.ubuntu.com/ubuntu-ports ${codename} main" \
+                    "deb http://ports.ubuntu.com/ubuntu-ports ${codename}-updates main" \
+                    "deb http://ports.ubuntu.com/ubuntu-ports ${codename}-backports main" \
+                    "deb http://ports.ubuntu.com/ubuntu-ports ${codename}-security main" \
+                    >/etc/apt/sources.list
+                fi
+              fi
+            fi
+
+            apt_opts=(
+              -o Acquire::Retries=3
+              -o Acquire::http::Timeout=30
+              -o Acquire::https::Timeout=30
+              -o Acquire::Languages=none
+            )
+            apt-get "${apt_opts[@]}" update
+            DEBIAN_FRONTEND=noninteractive apt-get "${apt_opts[@]}" install -y git build-essential bison autoconf gettext
           elif command -v dnf >/dev/null 2>&1; then
             dnf install -y git gcc gcc-c++ make bison autoconf gettext
           elif command -v yum >/dev/null 2>&1; then