From cd8a8da7dea1c015f6f1ce247b7bd5c14cfadc0f Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Wed, 30 Oct 2024 22:06:44 -0500 Subject: [PATCH] CI: fix handling of sources.list Closes #1088 We can't be sure whether a github runner will have new- or old- style sources.list, so check whether the new exists, else use the old style. Signed-off-by: Serge Hallyn --- .github/actions/install-dependencies/action.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index 2dd0f8ee..e0fb53fc 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -5,8 +5,16 @@ runs: steps: - shell: bash run: | - cat /etc/apt/sources.list.d/ubuntu.sources - sudo sed -i 's/^Types: deb/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources + if [ -f /etc/apt/sources.list.d/ubuntu.sources ]; then + echo "Found new-style sources.list.d" + cat /etc/apt/sources.list.d/ubuntu.sources + sudo sed -i 's/^Types: deb/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources + else + echo "Found legacy sources.list" + cat /etc/apt/sources.list + sudo sed -i '/deb-src/d' /etc/apt/sources.list + sudo sed -i '/^deb /p;s/ /-src /' /etc/apt/sources.list + fi export DEBIAN_PRIORITY=critical export DEBIAN_FRONTEND=noninteractive # let's try to work around upgrade breakage in a pkg we don't care about