File tree Expand file tree Collapse file tree 7 files changed +17
-26
lines changed Expand file tree Collapse file tree 7 files changed +17
-26
lines changed Original file line number Diff line number Diff line change 66
66
- set -o errexit; source ./ci/lint/06_script.sh
67
67
68
68
- stage : test
69
- name : ' 32-bit + dash [GOAL: install] [CentOS 7 ] [gui]'
69
+ name : ' 32-bit + dash [GOAL: install] [CentOS 8 ] [gui]'
70
70
env : >-
71
71
FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
72
72
Original file line number Diff line number Diff line change 7
7
export LC_ALL=C.UTF-8
8
8
9
9
export HOST=i686-pc-linux-gnu
10
- export CONTAINER_NAME=ci_i686_centos_7
11
- export DOCKER_NAME_TAG=centos:7
12
- export DOCKER_PACKAGES=" gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python36 -zmq which patch lbzip2 dash"
10
+ export CONTAINER_NAME=ci_i686_centos_8
11
+ export DOCKER_NAME_TAG=centos:8
12
+ export DOCKER_PACKAGES=" gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3 -zmq which patch lbzip2 dash rsync coreutils "
13
13
export GOAL=" install"
14
- export BITCOIN_CONFIG=" --enable-zmq --with-gui=qt5 --enable-reduce-exports --with-boost-process"
14
+ export DEP_OPTS=" NO_QT=1" # Gui disabled for now to avoid build failures
15
+ export BITCOIN_CONFIG=" --enable-zmq --with-gui=no --enable-reduce-exports --with-boost-process"
15
16
export CONFIG_SHELL=" /bin/dash"
Original file line number Diff line number Diff line change 7
7
export LC_ALL=C.UTF-8
8
8
9
9
export CONTAINER_NAME=ci_native_nowallet
10
- export DOCKER_NAME_TAG=ubuntu:18.04 # Use bionic to have one config run the tests in python3.6, see doc/dependencies.md (3.6 is not available in xenial/16.04)
11
- export PACKAGES=" python3-zmq clang-3.9 llvm-3.9 " # Use clang-3.9 to test C++11 compatibility, see doc/dependencies.md (3.8 is not available in bionic)
10
+ export DOCKER_NAME_TAG=ubuntu:18.04 # Use bionic to have one config run the tests in python3.6, see doc/dependencies.md
11
+ export PACKAGES=" python3-zmq clang-5.0 llvm-5.0 " # Use clang-5 to test C++17 compatibility, see doc/dependencies.md
12
12
export DEP_OPTS=" NO_WALLET=1"
13
13
export GOAL=" install"
14
- export BITCOIN_CONFIG=" --enable-glibc-back-compat --enable-reduce-exports CC=clang-3.9 CXX=clang++-3.9 --with-boost-process"
14
+ export BITCOIN_CONFIG=" --enable-glibc-back-compat --enable-reduce-exports CC=clang-5.0 CXX=clang++-5.0 --with-boost-process"
Original file line number Diff line number Diff line change 7
7
export LC_ALL=C.UTF-8
8
8
9
9
export CONTAINER_NAME=ci_native_qt5
10
- export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can compile our c++17 and run our functional tests in python3
10
+ export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic gcc-7 can compile our c++17 and run our functional tests in python3, see doc/dependencies.md
11
11
export PACKAGES=" python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
12
12
export DEP_OPTS=" NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1"
13
13
export TEST_RUNNER_EXTRA=" --previous-releases --coverage --extended --exclude feature_dbcrash" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
@@ -16,4 +16,4 @@ export RUN_UNIT_TESTS_SEQUENTIAL="true"
16
16
export RUN_UNIT_TESTS=" false"
17
17
export GOAL=" install"
18
18
export PREVIOUS_RELEASES_TO_DOWNLOAD=" v0.15.2 v0.16.3 v0.17.2 v0.18.1 v0.19.1"
19
- export BITCOIN_CONFIG=" --enable-zmq --with-libs=no --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\" --with-boost-process"
19
+ export BITCOIN_CONFIG=" --enable-zmq --with-libs=no --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-debug CFLAGS=\" -g0 -O2 -funsigned-char\" CXXFLAGS=\" -g0 -O2 -funsigned-char\" --with-boost-process"
Original file line number Diff line number Diff line change @@ -60,8 +60,8 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
60
60
fi
61
61
62
62
if [[ $DOCKER_NAME_TAG == centos* ]]; then
63
- ${CI_RETRY_EXE} DOCKER_EXEC yum -y install epel-release
64
- ${CI_RETRY_EXE} DOCKER_EXEC yum -y install $DOCKER_PACKAGES $PACKAGES
63
+ ${CI_RETRY_EXE} DOCKER_EXEC dnf -y install epel-release
64
+ ${CI_RETRY_EXE} DOCKER_EXEC dnf -y --allowerasing install $DOCKER_PACKAGES $PACKAGES
65
65
elif [ " $CI_USE_APT_INSTALL " != " no" ]; then
66
66
${CI_RETRY_EXE} DOCKER_EXEC apt-get update
67
67
${CI_RETRY_EXE} DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -y $PACKAGES $DOCKER_PACKAGES
Original file line number Diff line number Diff line change @@ -68,18 +68,8 @@ case $host in
68
68
;;
69
69
esac
70
70
71
- AC_ARG_ENABLE ( [ c++17] ,
72
- [ AS_HELP_STRING ( [ --enable-c++17] ,
73
- [ enable compilation in c++17 mode (disabled by default)] ) ] ,
74
- [ use_cxx17=$enableval] ,
75
- [ use_cxx17=no] )
76
-
77
- dnl Require C++11 or C++17 compiler (no GNU extensions)
78
- if test "x$use_cxx17" = xyes -o "x$enable_fuzz" = xyes ; then
79
- AX_CXX_COMPILE_STDCXX ( [ 17] , [ noext] , [ mandatory] )
80
- else
81
- AX_CXX_COMPILE_STDCXX ( [ 11] , [ noext] , [ mandatory] )
82
- fi
71
+ dnl Require C++17 compiler (no GNU extensions)
72
+ AX_CXX_COMPILE_STDCXX ( [ 17] , [ noext] , [ mandatory] )
83
73
84
74
dnl Check if -latomic is required for <std::atomic>
85
75
CHECK_ATOMIC
Original file line number Diff line number Diff line change @@ -7,11 +7,11 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
7
7
| --- | --- | --- | --- | --- | --- |
8
8
| Berkeley DB | [ 4.8.30] ( https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html ) | 4.8.x | No | | |
9
9
| Boost | [ 1.70.0] ( https://www.boost.org/users/download/ ) | [ 1.58.0] ( https://github.com/bitcoin/bitcoin/pull/19667 ) | No | | |
10
- | Clang | | [ 3.3 +] ( https://releases.llvm.org/download.html ) (C++11 support) | | | |
10
+ | Clang | | [ 5.0 +] ( https://releases.llvm.org/download.html ) (C++17 support) | | | |
11
11
| Expat | [ 2.2.7] ( https://libexpat.github.io/ ) | | No | Yes | |
12
12
| fontconfig | [ 2.12.1] ( https://www.freedesktop.org/software/fontconfig/release/ ) | | No | Yes | |
13
13
| FreeType | [ 2.7.1] ( https://download.savannah.gnu.org/releases/freetype ) | | No | | [ Yes] ( https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk ) (Android only) |
14
- | GCC | | [ 4.8 +] ( https://gcc.gnu.org/ ) (C++11 support) | | | |
14
+ | GCC | | [ 7 +] ( https://gcc.gnu.org/ ) (C++17 support) | | | |
15
15
| HarfBuzz-NG | | | | | [ Yes] ( https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk ) |
16
16
| libevent | [ 2.1.11-stable] ( https://github.com/libevent/libevent/releases ) | [ 2.0.21] ( https://github.com/bitcoin/bitcoin/pull/18676 ) | No | | |
17
17
| libpng | | | | | [ Yes] ( https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk ) |
You can’t perform that action at this time.
0 commit comments