Merge branch 'tmp-minimal-fix' into 'master'

.gitlab-ci.yml: merged options from minimal and Ubuntu minimal

See merge request openconnect/ocserv!264
This commit is contained in:
Nikos Mavrogiannopoulos
2021-05-16 21:27:05 +00:00

View File

@@ -13,6 +13,7 @@ variables:
CENTOS8_BUILD: buildenv-centos8
CENTOS7_BUILD: buildenv-centos7
CENTOS6_BUILD: buildenv-centos6
MINIMALCONFIG: "--without-protobuf --without-libtalloc-prefix --without-libnl --without-maxmind --without-geoip --without-libreadline-prefix --without-liboath --without-libc-prefix --without-pam --without-radius --without-libcrypt-prefix --without-utmp --without-libutil-prefix --without-libwrap --without-libwrap-prefix --without-libseccomp-prefix --without-libsystemd-prefix --without-http-parser --without-lz4 --without-gssapi --without-pcl-lib --disable-rpath --disable-seccomp --disable-anyconnect-compat --disable-compression"
JOBS: 2
Debian:
@@ -370,9 +371,9 @@ minimal:
script:
- git submodule update --init
- autoreconf -fvi
- ./configure --without-libnl --without-liboath --without-pam --without-radius --without-utmp --without-libwrap --without-http-parser --without-lz4 --without-gssapi --without-pcl-lib --without-protobuf
- ./configure $MINIMALCONFIG
- make -j$JOBS
- make check -j$JOBS XFAIL_TESTS="lz4-compression"
- make check -j$JOBS XFAIL_TESTS="lz4-compression lzs-compression"
tags:
- shared
- linux
@@ -393,9 +394,9 @@ minimal/Ubuntu20.04:
script:
- git submodule update --init
- autoreconf -fvi
- ./configure --without-protobuf --without-root-tests --without-nuttcp-tests --without-libtalloc-prefix --without-libnl --without-maxmind --without-geoip --without-libreadline-prefix --without-liboath --without-libc-prefix --without-pam --without-radius --without-libcrypt-prefix --without-utmp --without-libutil-prefix --without-libwrap --without-libwrap-prefix --without-libseccomp-prefix --without-libsystemd-prefix --without-http-parser --without-lz4 --without-gssapi --without-pcl-lib --disable-rpath --disable-seccomp --disable-anyconnect-compat --disable-compression
- ./configure $MINIMALCONFIG
- make -j$JOBS
- make check -j$JOBS
- make check -j$JOBS XFAIL_TESTS="lz4-compression lzs-compression"
tags:
- shared
- linux