CI: install libpsl or configure --without-libpsl in builds

As a follow-up to the stricted libpsl check in configure
This commit is contained in:
Daniel Stenberg 2024-01-08 16:49:21 +01:00
parent 2998874bb6
commit d18811b52b
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
9 changed files with 28 additions and 23 deletions

View file

@ -53,7 +53,7 @@ jobs:
steps:
- run: |
sudo apt-get update --yes
sudo apt-get install --yes libtool autoconf automake pkg-config stunnel4
sudo apt-get install --yes libtool autoconf automake pkg-config 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

View file

@ -35,7 +35,7 @@ jobs:
- name: run configure --with-openssl
run: |
autoreconf -fi
./configure --with-openssl
./configure --with-openssl --without-libpsl
- name: run cmake
run: |

View file

@ -30,7 +30,7 @@ jobs:
- run: autoreconf -fi
name: 'autoreconf'
- run: ./configure --without-ssl
- run: ./configure --without-ssl --without-libpsl
name: 'configure'
- run: make V=1 && make V=1 clean
@ -48,7 +48,7 @@ jobs:
echo "::stop-commands::$(uuidgen)"
tar xvf curl-99.98.97.tar.gz
pushd curl-99.98.97
./configure --prefix=$HOME/temp --without-ssl
./configure --prefix=$HOME/temp --without-ssl --without-libpsl
make
make test-ci
make install
@ -73,7 +73,7 @@ jobs:
touch curl-99.98.97/docs/{cmdline-opts,libcurl}/Makefile.inc
mkdir build
pushd build
../curl-99.98.97/configure --without-ssl
../curl-99.98.97/configure --without-ssl --without-libpsl
make
make test-ci
popd
@ -96,7 +96,7 @@ jobs:
pushd curl-99.98.97
mkdir build
pushd build
../configure --without-ssl --enable-debug "--prefix=${PWD}/pkg"
../configure --without-ssl --enable-debug "--prefix=${PWD}/pkg" --without-libpsl
make -j3
make -j3 test-ci
make -j3 install

View file

@ -154,7 +154,7 @@ jobs:
singleuse: --unit
- name: rustls
install_steps: rust rustls pytest valgrind
install_steps: rust rustls pytest valgrind libpsl-dev
configure: --with-rustls=$HOME/rustls --enable-debug
singleuse: --unit

View file

@ -117,7 +117,7 @@ jobs:
configure: --enable-debug --with-secure-transport --enable-websockets
macosx-version-min: 10.8
- name: gcc SecureTransport
configure: CC=gcc-12 --enable-debug --with-secure-transport --enable-websockets
configure: CC=gcc-12 --enable-debug --with-secure-transport --enable-websockets --without-libpsl
macosx-version-min: 10.8
- name: OpenSSL http2
install: nghttp2 openssl
@ -142,7 +142,7 @@ jobs:
configure: --enable-debug --disable-ldap --with-openssl=/usr/local/opt/openssl --enable-websockets
macosx-version-min: 10.15
steps:
- run: echo libtool autoconf automake pkg-config ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
- run: echo libtool autoconf automake pkg-config libpsl ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
name: 'brew bundle'
# Run this command with retries because of spurious failures seen

View file

@ -68,7 +68,7 @@ jobs:
steps:
- run: |
sudo apt-get update
sudo apt-get install libtool autoconf automake pkg-config stunnel4 ${{ matrix.build.install }}
sudo apt-get install libtool autoconf automake pkg-config stunnel4 libpsl-dev ${{ matrix.build.install }}
sudo python3 -m pip install impacket
name: 'install prereqs and impacket'