boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-01 05:44:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use newer OS for some Travis configs

Browse Source
This commit is contained in:
Vinnie Falco
2020-04-19 16:55:37 -07:00
parent 3c6600c8f4
commit ff69637ced
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -16,7 +16,8 @@ addons:
sources: &base_sources sources: &base_sources
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: &base_packages packages: &base_packages
- python-software-properties #- python-software-properties
- software-properties-common
- libffi-dev - libffi-dev
- libstdc++6 - libstdc++6
- binutils-gold - binutils-gold
@@ -70,7 +71,6 @@ matrix:
# GCC 6.0, Debug + Coverage # GCC 6.0, Debug + Coverage
- os: linux - os: linux
dist: trusty
compiler: g++-6 compiler: g++-6
env: env:
- VARIANT=beast_coverage - VARIANT=beast_coverage
@@ -91,7 +91,6 @@ matrix:
# Default clang++ with libc++ # Default clang++ with libc++
- os: linux - os: linux
dist: trusty
compiler: clang++-libc++ compiler: clang++-libc++
env: env:
- VARIANT=debug - VARIANT=debug
@@ -107,7 +106,7 @@ matrix:
# GCC 5.0, Valgrind # GCC 5.0, Valgrind
- os: linux - os: linux
dist: trusty dist: bionic
compiler: g++-5 compiler: g++-5
env: env:
- VARIANT=beast_valgrind - VARIANT=beast_valgrind

1
tools/build-and-test.sh
View File

@@ -111,6 +111,7 @@ function build_bjam ()
libs/beast/test/beast/zlib//fat-tests \ libs/beast/test/beast/zlib//fat-tests \
toolset=$TOOLSET \ toolset=$TOOLSET \
variant=$VARIANT \ variant=$VARIANT \
link=static \
-j${JOBS} -j${JOBS}
elif [[ $VARIANT == "debug" ]]; then elif [[ $VARIANT == "debug" ]]; then
b2 \ b2 \