mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-04 08:20:28 +01:00
build/travis: build both against crypto "gnutls" and "nss"
We already do matrix-builds with autotools|meson and gcc|clang. Make the selected crypto backend depending on the compiler, so that we get more coverage.
This commit is contained in:
parent
e01f7f2c6d
commit
6b8280f6a9
1 changed files with 12 additions and 1 deletions
13
.travis.yml
13
.travis.yml
|
|
@ -79,6 +79,11 @@ before_install:
|
|||
script:
|
||||
- |
|
||||
if test "$BUILD_TYPE" == 'meson'; then
|
||||
if [ "$CC" == gcc ]; then
|
||||
CRYPTO=nss
|
||||
else
|
||||
CRYPTO=gnutls
|
||||
fi &&
|
||||
meson build \
|
||||
\
|
||||
-D ld_gc=false \
|
||||
|
|
@ -91,6 +96,7 @@ script:
|
|||
-D vapi=false \
|
||||
-D introspection=false \
|
||||
-D qt=false \
|
||||
-D crypto=$CRYPTO \
|
||||
\
|
||||
-D docs=true \
|
||||
\
|
||||
|
|
@ -103,11 +109,16 @@ script:
|
|||
fi
|
||||
- |
|
||||
if test "$BUILD_TYPE" == 'autotools'; then
|
||||
if [ "$CC" == gcc ]; then
|
||||
CRYPTO=gnutls
|
||||
else
|
||||
CRYPTO=nss
|
||||
fi &&
|
||||
git clean -fdx &&
|
||||
NOCONFIGURE=1 ./autogen.sh &&
|
||||
mkdir ./build &&
|
||||
pushd ./build &&
|
||||
../configure --prefix="$PWD/INST" --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-config-plugin-ibft --enable-ifupdown --enable-tests &&
|
||||
../configure --prefix="$PWD/INST" --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-config-plugin-ibft --enable-ifupdown --enable-tests --with-crypto=$CRYPTO &&
|
||||
make -j4 &&
|
||||
if [ "$CC" == gcc ]; then
|
||||
sudo locale-gen pl_PL.UTF-8 &&
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue