From 8439007fe56a15e1c8e562edff1238fd99305ff8 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 20 Sep 2024 00:51:35 +0200 Subject: [PATCH] GHA: keep default pkgconf, do not replace with pkg-config on Linux Ubuntu has the `pkgconf` package installed by default that implements the `pkg-config` command. Switch CI `apt` commands over to `pkgconf` to avoid replacing it in every job run. Avoids: ``` The following packages will be REMOVED: pkgconf r-base-dev The following NEW packages will be installed: [...] pkg-config [...] ``` https://github.com/curl/curl/actions/runs/10949915766/job/30404126342?pr=14972#step:2:20 Closes #14974 --- .github/workflows/awslc.yml | 2 +- .github/workflows/http3-linux.yml | 4 ++-- .github/workflows/linux.yml | 2 +- .github/workflows/linux32.yml | 2 +- .github/workflows/torture.yml | 2 +- .github/workflows/wolfssl.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/awslc.yml b/.github/workflows/awslc.yml index 479a720732..73b3d35f2f 100644 --- a/.github/workflows/awslc.yml +++ b/.github/workflows/awslc.yml @@ -52,7 +52,7 @@ jobs: - run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update - sudo apt-get install --yes libtool autoconf automake pkg-config stunnel4 libpsl-dev + sudo apt-get install --yes libtool autoconf automake pkgconf stunnel4 libpsl-dev # ensure we don't pick up openssl in this build sudo apt remove --yes libssl-dev sudo python3 -m pip install impacket diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml index c3b5c31efd..7132e41306 100644 --- a/.github/workflows/http3-linux.yml +++ b/.github/workflows/http3-linux.yml @@ -162,7 +162,7 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update - sudo apt-get install libtool autoconf automake pkg-config stunnel4 \ + sudo apt-get install libtool autoconf automake pkgconf stunnel4 \ libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev \ nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin \ libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools \ @@ -298,7 +298,7 @@ jobs: - run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update - sudo apt-get install libtool autoconf automake pkg-config stunnel4 \ + sudo apt-get install libtool autoconf automake pkgconf stunnel4 \ libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev libev-dev libc-ares-dev \ nettle-dev libp11-kit-dev libtspi-dev libunistring-dev guile-2.2-dev libtasn1-bin \ libtasn1-6-dev libidn2-0-dev gawk gperf libtss2-dev dns-root-data bison gtk-doc-tools \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a1e7293465..cf81f069ec 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -252,7 +252,7 @@ jobs: run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update - sudo apt-get install libtool autoconf automake pkg-config stunnel4 libpsl-dev libbrotli-dev libzstd-dev ${{ matrix.build.install_packages }} + sudo apt-get install libtool autoconf automake pkgconf stunnel4 libpsl-dev libbrotli-dev libzstd-dev ${{ matrix.build.install_packages }} sudo python3 -m pip install impacket name: 'install prereqs and impacket' diff --git a/.github/workflows/linux32.yml b/.github/workflows/linux32.yml index 71f377f162..da146c2b6a 100644 --- a/.github/workflows/linux32.yml +++ b/.github/workflows/linux32.yml @@ -60,7 +60,7 @@ jobs: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo dpkg --add-architecture i386 sudo apt-get update -y - sudo apt-get install -y --no-install-suggests --no-install-recommends libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install_packages }} + sudo apt-get install -y --no-install-suggests --no-install-recommends libtool autoconf automake pkgconf stunnel4 ${{ matrix.build.install_packages }} sudo python3 -m pip install impacket name: 'install prereqs' diff --git a/.github/workflows/torture.yml b/.github/workflows/torture.yml index 210fa08d7e..3558d27b03 100644 --- a/.github/workflows/torture.yml +++ b/.github/workflows/torture.yml @@ -65,7 +65,7 @@ jobs: - run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update - sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }} + sudo apt-get install libtool autoconf automake pkgconf stunnel4 ${{ matrix.build.install }} sudo python3 -m pip install impacket name: 'install prereqs and impacket' diff --git a/.github/workflows/wolfssl.yml b/.github/workflows/wolfssl.yml index 1d5400d6a9..ba6d92859a 100644 --- a/.github/workflows/wolfssl.yml +++ b/.github/workflows/wolfssl.yml @@ -65,7 +65,7 @@ jobs: - run: | sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list sudo apt-get update - sudo apt-get install libtool autoconf automake pkg-config stunnel4 libpsl-dev ${{ matrix.build.install }} + sudo apt-get install libtool autoconf automake pkgconf stunnel4 libpsl-dev ${{ matrix.build.install }} sudo python3 -m pip install impacket name: 'install prereqs and impacket' -- 2.47.3