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 | |
| parent | a66ba6d029b3948dec0cf092bb844f70c16b07dc (diff) | |
ci: Merge C++17 build with one of the existing ones
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | ci/test/00_setup_env_native_cxx17.sh | 13 | ||||
| -rw-r--r-- | ci/test/00_setup_env_native_qt5.sh | 2 |
3 files changed, 2 insertions, 20 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" diff --git a/ci/test/00_setup_env_native_cxx17.sh b/ci/test/00_setup_env_native_cxx17.sh deleted file mode 100644 index 9a75276420..0000000000 --- a/ci/test/00_setup_env_native_cxx17.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) 2020 The Bitcoin Core developers -# Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. - -export LC_ALL=C.UTF-8 - -export CONTAINER_NAME=ci_native_cxx17 -export PACKAGES="python3-zmq libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev" -export NO_DEPENDS=1 -export GOAL="install" -export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-c++17" diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh index 87c8b70998..4dedea23bc 100644 --- a/ci/test/00_setup_env_native_qt5.sh +++ b/ci/test/00_setup_env_native_qt5.sh @@ -14,4 +14,4 @@ export RUN_UNIT_TESTS_SEQUENTIAL="true" export RUN_UNIT_TESTS="false" export GOAL="install" export TEST_PREVIOUS_RELEASES=true -export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\"" +export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-c++17 --enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\"" |