Skip to content

Commit e5b9308

Browse files
author
MarcoFalke
committed
Merge #18829: ci: Merge C++17 build with one of the existing ones
aaaacff ci: Merge C++17 build with one of the existing ones (MarcoFalke) Pull request description: No need to spin up an extra vm for each pull request for a simple sanity check that any of the other already running machines can test. Top commit has no ACKs. Tree-SHA512: ce1609aa4cbc057fc9e85e61f300eac2317cc206647a20f6b001180ffed6623e2243a408476546e16baacb91cb2dd9a2e7b6e2402c8fd829a72860b2c3eb7be6
2 parents ef8ef31 + aaaacff commit e5b9308

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

.travis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
129129
130130
- stage: test
131-
name: 'x86_64 Linux [GOAL: install] [bionic] [previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
131+
name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
132132
env: >-
133133
FILE_ENV="./ci/test/00_setup_env_native_qt5.sh"
134134
@@ -148,11 +148,6 @@ jobs:
148148
env: >-
149149
FILE_ENV="./ci/test/00_setup_env_native_valgrind.sh"
150150
151-
- stage: test
152-
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, c++17]'
153-
env: >-
154-
FILE_ENV="./ci/test/00_setup_env_native_cxx17.sh"
155-
156151
- stage: test
157152
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: fuzzer,address,undefined]'
158153
env: >-

ci/test/00_setup_env_native_cxx17.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

ci/test/00_setup_env_native_qt5.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ export RUN_UNIT_TESTS_SEQUENTIAL="true"
1414
export RUN_UNIT_TESTS="false"
1515
export GOAL="install"
1616
export TEST_PREVIOUS_RELEASES=true
17-
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\""
17+
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\""

0 commit comments

Comments
 (0)