mirror of
https://github.com/moparisthebest/curl
synced 2024-12-25 01:28:51 -05:00
travis: use libpsl from Xenial
This makes building libpsl and libidn2 from source unnecessary and removes the need for the autopoint and libunistring-dev packages. Closes https://github.com/curl/curl/pull/3779
This commit is contained in:
Marcel Raad
parent
a7ae01cb75
commit
1ef146a8db
75
.travis.yml
75
.travis.yml
@ -2,9 +2,7 @@ language: c
|
|||||||
sudo: required
|
sudo: required
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/libpsl-0.20.1
|
|
||||||
- $HOME/mbedtls-mbedtls-2.8.0
|
- $HOME/mbedtls-mbedtls-2.8.0
|
||||||
- $HOME/libidn2-2.0.4
|
|
||||||
- $HOME/wolfssl-4.0.0-stable
|
- $HOME/wolfssl-4.0.0-stable
|
||||||
- $HOME/nghttp2-1.34.0
|
- $HOME/nghttp2-1.34.0
|
||||||
|
|
||||||
@ -28,8 +26,6 @@ addons:
|
|||||||
- libstdc++-8-dev
|
- libstdc++-8-dev
|
||||||
- stunnel4
|
- stunnel4
|
||||||
- libidn2-0-dev
|
- libidn2-0-dev
|
||||||
- autopoint # for libpsl that needs autoreconf that uses gettext that needs it
|
|
||||||
- libunistring-dev # for libidn2 needed by libpsl
|
|
||||||
- gnutls-bin
|
- gnutls-bin
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
@ -79,6 +75,13 @@ matrix:
|
|||||||
env:
|
env:
|
||||||
- T=normal C="--disable-verbose" CPPFLAGS="-Wno-variadic-macros" NOTESTS=1
|
- T=normal C="--disable-verbose" CPPFLAGS="-Wno-variadic-macros" NOTESTS=1
|
||||||
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- *common_sources
|
||||||
|
packages:
|
||||||
|
- *common_packages
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
dist: trusty
|
dist: trusty
|
||||||
@ -91,12 +94,26 @@ matrix:
|
|||||||
env:
|
env:
|
||||||
- T=novalgrind BORINGSSL=yes C="--with-ssl=$HOME/boringssl" LD_LIBRARY_PATH=/home/travis/boringssl/lib:/usr/local/lib
|
- T=novalgrind BORINGSSL=yes C="--with-ssl=$HOME/boringssl" LD_LIBRARY_PATH=/home/travis/boringssl/lib:/usr/local/lib
|
||||||
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- *common_sources
|
||||||
|
packages:
|
||||||
|
- *common_packages
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
dist: xenial
|
dist: xenial
|
||||||
env:
|
env:
|
||||||
- T=debug-wolfssl C="--with-wolfssl --without-ssl"
|
- T=debug-wolfssl C="--with-wolfssl --without-ssl"
|
||||||
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- *common_sources
|
||||||
|
packages:
|
||||||
|
- *common_packages
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -111,6 +128,7 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -125,6 +143,7 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -139,6 +158,7 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -154,6 +174,7 @@ matrix:
|
|||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
- libgnutls28-dev
|
- libgnutls28-dev
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -168,6 +189,7 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -183,6 +205,7 @@ matrix:
|
|||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
- libnss3-dev
|
- libnss3-dev
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
dist: trusty
|
dist: trusty
|
||||||
@ -217,6 +240,13 @@ matrix:
|
|||||||
env:
|
env:
|
||||||
- T=cmake
|
- T=cmake
|
||||||
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- *common_sources
|
||||||
|
packages:
|
||||||
|
- *common_packages
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -231,6 +261,7 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -244,12 +275,20 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- *common_packages
|
- *common_packages
|
||||||
- lcov
|
- lcov
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
dist: xenial
|
dist: xenial
|
||||||
env:
|
env:
|
||||||
- T=distcheck
|
- T=distcheck
|
||||||
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- *common_sources
|
||||||
|
packages:
|
||||||
|
- *common_packages
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -264,6 +303,7 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: xenial
|
dist: xenial
|
||||||
@ -279,6 +319,7 @@ matrix:
|
|||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
- clang-tidy-7
|
- clang-tidy-7
|
||||||
|
- libpsl-dev
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
dist: trusty
|
dist: trusty
|
||||||
@ -307,6 +348,7 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- *common_packages
|
- *common_packages
|
||||||
- clang-7
|
- clang-7
|
||||||
|
- libpsl-dev
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- eval "${OVERRIDE_CC}"
|
- eval "${OVERRIDE_CC}"
|
||||||
@ -351,29 +393,6 @@ before_script:
|
|||||||
echo "BoringSSL lib dir: "`pwd` &&
|
echo "BoringSSL lib dir: "`pwd` &&
|
||||||
export LIBS=-lpthread )
|
export LIBS=-lpthread )
|
||||||
fi
|
fi
|
||||||
- |
|
|
||||||
if [ $TRAVIS_OS_NAME = linux ]; then
|
|
||||||
if [ ! -e $HOME/libidn2-2.0.4/Makefile ]; then
|
|
||||||
(cd $HOME && \
|
|
||||||
curl -LO https://ftp.gnu.org/gnu/libidn/libidn2-2.0.4.tar.gz && \
|
|
||||||
tar -xzf libidn2-2.0.4.tar.gz && \
|
|
||||||
cd libidn2-2.0.4 && \
|
|
||||||
./configure && \
|
|
||||||
make)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
- |
|
|
||||||
if [ $TRAVIS_OS_NAME = linux ]; then
|
|
||||||
if [ ! -e $HOME/libpsl-0.20.1/Makefile ]; then
|
|
||||||
(cd $HOME && \
|
|
||||||
curl -LO https://github.com/rockdaboot/libpsl/releases/download/libpsl-0.20.1/libpsl-0.20.1.tar.gz && \
|
|
||||||
tar -xzf libpsl-0.20.1.tar.gz && \
|
|
||||||
cd libpsl-0.20.1 && \
|
|
||||||
autoreconf -i && \
|
|
||||||
./configure && \
|
|
||||||
make)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
- |
|
- |
|
||||||
if [ $TRAVIS_OS_NAME = linux ]; then
|
if [ $TRAVIS_OS_NAME = linux ]; then
|
||||||
if [ ! -e $HOME/mbedtls-mbedtls-2.8.0/library/libmbedtls.a ]; then
|
if [ ! -e $HOME/mbedtls-mbedtls-2.8.0/library/libmbedtls.a ]; then
|
||||||
@ -411,8 +430,6 @@ before_script:
|
|||||||
fi
|
fi
|
||||||
- |
|
- |
|
||||||
if [ $TRAVIS_OS_NAME = linux ]; then
|
if [ $TRAVIS_OS_NAME = linux ]; then
|
||||||
(cd $HOME/libidn2-2.0.4 && sudo make install)
|
|
||||||
(cd $HOME/libpsl-0.20.1 && sudo make install)
|
|
||||||
(cd $HOME/mbedtls-mbedtls-2.8.0 && sudo make install)
|
(cd $HOME/mbedtls-mbedtls-2.8.0 && sudo make install)
|
||||||
(cd $HOME/wolfssl-4.0.0-stable && sudo make install)
|
(cd $HOME/wolfssl-4.0.0-stable && sudo make install)
|
||||||
(cd $HOME/nghttp2-1.34.0 && sudo make install)
|
(cd $HOME/nghttp2-1.34.0 && sudo make install)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user