From 3e0e2cc1ab6f3f44c7d35e84256858edc2ef73f5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 16 Apr 2026 15:13:25 +0200 Subject: [PATCH] GHA: drop 3rd-party apt source `docker.list` Seen on `ubuntu-slim` runners. Also: - extend to two jobs to `ls -l` package sources on both ubuntu-latest, ubuntu-24.04-arm, and ubuntu-slim. - drop former stray apt source `ondrej-ubuntu-php-noble.sources`. It's no longer present on the image. Closes #21344 --- .github/workflows/checkdocs.yml | 2 +- .github/workflows/checksrc.yml | 5 +++-- .github/workflows/codeql.yml | 2 +- .github/workflows/http3-linux.yml | 4 ++-- .github/workflows/linux.yml | 5 +++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/checkdocs.yml b/.github/workflows/checkdocs.yml index 0c2ecf3676..769ed8f239 100644 --- a/.github/workflows/checkdocs.yml +++ b/.github/workflows/checkdocs.yml @@ -100,7 +100,7 @@ jobs: - name: 'install' run: | - sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,microsoft-prod.list,ondrej-ubuntu-php-noble.sources} + sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,docker.list,microsoft-prod.list} sudo apt-get -o Dpkg::Use-Pty=0 update sudo apt-get -o Dpkg::Use-Pty=0 install aspell aspell-en python3 -m venv ~/venv diff --git a/.github/workflows/checksrc.yml b/.github/workflows/checksrc.yml index 5e3e87ca59..c8bb6e6278 100644 --- a/.github/workflows/checksrc.yml +++ b/.github/workflows/checksrc.yml @@ -102,7 +102,8 @@ jobs: steps: - name: 'install pmccabe' run: | - sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,microsoft-prod.list,ondrej-ubuntu-php-noble.sources} + ls -l /etc/apt/sources.list.d + sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,docker.list,docker.list,microsoft-prod.list} sudo apt-get -o Dpkg::Use-Pty=0 update sudo apt-get -o Dpkg::Use-Pty=0 install \ pmccabe @@ -121,7 +122,7 @@ jobs: steps: - name: 'install prereqs' run: | - sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,microsoft-prod.list,ondrej-ubuntu-php-noble.sources} + sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,docker.list,microsoft-prod.list} sudo apt-get -o Dpkg::Use-Pty=0 update sudo apt-get -o Dpkg::Use-Pty=0 install \ libxml2-utils diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 17db4154fc..42bd4550a4 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -71,7 +71,7 @@ jobs: if: ${{ matrix.platform == 'Linux' }} timeout-minutes: 5 run: | - sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,microsoft-prod.list,ondrej-ubuntu-php-noble.sources} + sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,docker.list,microsoft-prod.list} sudo apt-get -o Dpkg::Use-Pty=0 update printf "#!/bin/sh while [ \$? = 0 ]; do for i in 1 2 3; do timeout 60 \"\$@\" && break 2; echo \"Error: slow server, retry \$i\"; sleep 1 diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml index d41158ef1e..8100ccadcd 100644 --- a/.github/workflows/http3-linux.yml +++ b/.github/workflows/http3-linux.yml @@ -206,7 +206,7 @@ jobs: - name: 'install build prereqs' if: ${{ steps.settings.outputs.needs-build == 'true' }} run: | - sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,microsoft-prod.list,ondrej-ubuntu-php-noble.sources} + sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,docker.list,microsoft-prod.list} sudo apt-get -o Dpkg::Use-Pty=0 update printf "#!/bin/sh while [ \$? = 0 ]; do for i in 1 2 3; do timeout 60 \"\$@\" && break 2; echo \"Error: slow server, retry \$i\"; sleep 1 @@ -560,7 +560,7 @@ jobs: 'apache2 apache2-dev libnghttp2-dev vsftpd dante-server libev-dev' || '' }} run: | - sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,microsoft-prod.list,ondrej-ubuntu-php-noble.sources} + sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,docker.list,microsoft-prod.list} sudo apt-get -o Dpkg::Use-Pty=0 update printf "#!/bin/sh while [ \$? = 0 ]; do for i in 1 2 3; do timeout 45 \"\$@\" && break 2; echo \"Error: slow server, retry \$i\"; sleep 1 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6d2e9080a4..0274e1c74e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -454,7 +454,8 @@ jobs: ${{ contains(matrix.build.install_steps, 'pytest') && 'apache2 apache2-dev libnghttp2-dev vsftpd dante-server' || '' }} run: | - sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,microsoft-prod.list,ondrej-ubuntu-php-noble.sources} + ls -l /etc/apt/sources.list.d + sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,docker.list,microsoft-prod.list} sudo apt-get -o Dpkg::Use-Pty=0 update printf "#!/bin/sh while [ \$? = 0 ]; do for i in 1 2 3; do timeout 45 \"\$@\" && break 2; echo \"Error: slow server, retry \$i\"; sleep 1 @@ -477,7 +478,7 @@ jobs: - name: 'install prereqs (i686)' if: ${{ contains(matrix.build.name, 'i686') }} run: | - sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,microsoft-prod.list,ondrej-ubuntu-php-noble.sources} + sudo rm -f /etc/apt/sources.list.d/{azure-cli.sources,docker.list,microsoft-prod.list} sudo dpkg --add-architecture i386 sudo apt-get -o Dpkg::Use-Pty=0 update printf "#!/bin/sh