curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-16 17:12:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

travis: enable brotli for all xenial jobs

Browse Source 
There's no need for a separate job, and no need to build it from source
with Xenial.

Closes
This commit is contained in:
Marcel Raad 2019-06-12 16:15:39 +02:00
parent ba2192e6c8
commit ce1b0da99e
No known key found for this signature in database
GPG Key ID: FE4D8BC5EE1701DD
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
.travis.yml
View File

@ -82,12 +82,7 @@ matrix:
packages: packages:
- *common_packages - *common_packages
- libpsl-dev - libpsl-dev
- os: linux - libbrotli-dev
compiler: gcc
dist: trusty
env:
- T=normal BROTLI=yes
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: xenial dist: xenial
@ -101,6 +96,7 @@ matrix:
packages: packages:
- *common_packages - *common_packages
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: xenial dist: xenial
@ -114,12 +110,21 @@ matrix:
packages: packages:
- *common_packages - *common_packages
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: xenial dist: xenial
env: env:
- T=debug-mesalink C="--with-mesalink --without-ssl" - T=debug-mesalink C="--with-mesalink --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
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -135,6 +140,7 @@ matrix:
- *common_packages - *common_packages
- clang-7 - clang-7
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -150,6 +156,7 @@ matrix:
- *common_packages - *common_packages
- clang-7 - clang-7
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -165,6 +172,7 @@ matrix:
- *common_packages - *common_packages
- clang-7 - clang-7
- libpsl-dev - libpsl-dev
- libbrotli-dev
- libmbedtls-dev - libmbedtls-dev
- os: linux - os: linux
compiler: clang compiler: clang
@ -182,6 +190,7 @@ matrix:
- clang-7 - clang-7
- libgnutls28-dev - libgnutls28-dev
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -197,6 +206,7 @@ matrix:
- *common_packages - *common_packages
- clang-7 - clang-7
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -213,6 +223,7 @@ matrix:
- clang-7 - clang-7
- libnss3-dev - libnss3-dev
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: trusty dist: trusty
@ -257,6 +268,7 @@ matrix:
packages: packages:
- *common_packages - *common_packages
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -272,6 +284,7 @@ matrix:
- *common_packages - *common_packages
- clang-7 - clang-7
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: xenial dist: xenial
@ -286,6 +299,7 @@ matrix:
- *common_packages - *common_packages
- lcov - lcov
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: gcc compiler: gcc
dist: xenial dist: xenial
@ -299,6 +313,7 @@ matrix:
packages: packages:
- *common_packages - *common_packages
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -314,6 +329,7 @@ matrix:
- *common_packages - *common_packages
- clang-7 - clang-7
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -330,6 +346,7 @@ matrix:
- clang-7 - clang-7
- clang-tidy-7 - clang-tidy-7
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -345,6 +362,7 @@ matrix:
- *common_packages - *common_packages
- clang-7 - clang-7
- libpsl-dev - libpsl-dev
- libbrotli-dev
- os: linux - os: linux
compiler: clang compiler: clang
dist: xenial dist: xenial
@ -360,6 +378,7 @@ matrix:
- *common_packages - *common_packages
- clang-7 - clang-7
- libpsl-dev - libpsl-dev
- libbrotli-dev
before_install: before_install:
- eval "${OVERRIDE_CC}" - eval "${OVERRIDE_CC}"
@ -373,20 +392,6 @@ install:
before_script: before_script:
- ./buildconf - ./buildconf
- |
# No brotli package available for Trusty. Download & compile from source.
# Cannot be done in the install script because cmake is needed.
if [ "$TRAVIS_OS_NAME" = linux -a "$BROTLI" ]; then
curl -L https://github.com/google/brotli/archive/v1.0.1.tar.gz |
tar xzf - &&
(
cd brotli-1.0.1 &&
cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib &&
make &&
sudo make install
)
fi
- | - |
if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then
(cd $HOME && (cd $HOME &&