Also switch the runner's apt mirror list away from Azure

GitHub's ubuntu-24.04 runners point ubuntu.sources at mirror+file:/etc/apt/apt-mirrors.txt, which lists the Azure mirror first, so rewriting ubuntu.sources alone changed nothing (PR #2095's build still fetched from azure.archive.ubuntu.com). build-deps-ubuntu now rewrites both files.
This commit is contained in:
binwiederhier committed 2026-10-23 13:21:14 +00:00
1 parent 3a768188c4
commit 958c8baf03
1 file changed
+4 -3
+4 -3
View File
@@ -113,11 +113,12 @@ docker-dev:
APT_GET := sudo apt-get -o Acquire::Retries=3 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30
#
# The Azure mirror also trickles for minutes without stalling, which no apt timeout catches, so
# GitHub runners use the main Ubuntu archive instead (a no-op elsewhere).
APT_SOURCES := /etc/apt/sources.list.d/ubuntu.sources
# GitHub runners use the main Ubuntu archive instead (a no-op elsewhere). Their ubuntu.sources points
# at a mirror list (mirror+file:/etc/apt/apt-mirrors.txt) with the Azure mirror first, so both change.
APT_SOURCES := /etc/apt/sources.list.d/ubuntu.sources /etc/apt/apt-mirrors.txt
build-deps-ubuntu:
[ ! -f $(APT_SOURCES) ] || sudo sed -i 's|azure\.archive\.ubuntu\.com|archive.ubuntu.com|g' $(APT_SOURCES)
for f in $(APT_SOURCES); do [ ! -f $$f ] || sudo sed -i 's|azure\.archive\.ubuntu\.com|archive.ubuntu.com|g' $$f; done
$(APT_GET) update
$(APT_GET) install -y \
curl \