]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
CI: Stop working around httpredir.debian.org
authorSimon McVittie <smcv@collabora.com>
Tue, 1 Oct 2024 11:56:00 +0000 (12:56 +0100)
committerSimon McVittie <smcv@collabora.com>
Mon, 28 Oct 2024 17:21:42 +0000 (17:21 +0000)
All Debian Docker images from the last few years use deb.debian.org,
which is reliable, by default.

Debian 12 Docker images no longer have /etc/apt/sources.list (they use
/etc/apt/sources.list.d instead) so this is a prerequisite for moving
our CI to a supported version of Debian.

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 34284edecf4b245ddcc9c77b2710030bdc050b42)

tools/ci-install.sh

index 8011ac4dd51dc5a8f15cc5b22ebe18d109a2175e..7737a8746509c7bb51819dd5f390294a55d0950d 100755 (executable)
@@ -68,11 +68,6 @@ case "$ci_distro" in
         # Don't ask questions, just do it
         sudo="$sudo env DEBIAN_FRONTEND=noninteractive"
 
-        # Debian Docker images use httpredir.debian.org but it seems to be
-        # unreliable; use a CDN instead
-        $sudo sed -i -e 's/httpredir\.debian\.org/deb.debian.org/g' \
-            /etc/apt/sources.list
-
         case "$ci_host" in
             (i686-w64-mingw32)
                 $sudo dpkg --add-architecture i386