diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-04-30 09:59:07 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-04-30 12:50:36 -0400 |
| commit | aaaacff107a71e2495eff17602fa2bec52c02e4d (patch) | |
| tree | 132e746a17557f17ae183026b61a668431ff685d /.travis.yml | |
| parent | a66ba6d029b3948dec0cf092bb844f70c16b07dc (diff) | |
ci: Merge C++17 build with one of the existing ones
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 1e49815a4c..63e502cc3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,7 +128,7 @@ jobs: FILE_ENV="./ci/test/00_setup_env_i686_centos.sh" - stage: test - name: 'x86_64 Linux [GOAL: install] [bionic] [previous releases, uses qt5 dev package and some depends packages] [unsigned char]' + name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]' env: >- FILE_ENV="./ci/test/00_setup_env_native_qt5.sh" @@ -149,11 +149,6 @@ jobs: FILE_ENV="./ci/test/00_setup_env_native_valgrind.sh" - stage: test - name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, c++17]' - env: >- - FILE_ENV="./ci/test/00_setup_env_native_cxx17.sh" - - - stage: test name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: fuzzer,address,undefined]' env: >- FILE_ENV="./ci/test/00_setup_env_native_fuzz.sh" |