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

diff --git a/.github/workflows/awslc.yml b/.github/workflows/awslc.yml
index 479a720732422a06780d74c58a5db05332d99d53..73b3d35f2f2bc0dbc5aeceea49805fd2dd60f31d 100644 (file)
--- 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 c3b5c31efd30726a7fb998a7db6a4fb6d63a8a4a..7132e41306a1bdeb2a4722f187463ddc3e5289a5 100644 (file)
--- 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 a1e72934652386ce133e03bed1e56551e0e26f1a..cf81f069ec82e3dcab1ee5906af0caae489dbbff 100644 (file)
--- 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 71f377f16252cdc985a02206e800fb6f1044daff..da146c2b6a45958a025c93f77240c69a65c3a1a1 100644 (file)
--- 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 210fa08d7ea00febe3f80d319416a3166c3adc4b..3558d27b03740b7311227d961a63b27701f91d3f 100644 (file)
--- 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 1d5400d6a92cc138417d8c5fe2948de304e18712..ba6d92859a47368f4f8254ef8a4c30666fefc6b7 100644 (file)
--- 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'