diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-12-23 15:18:31 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-12-23 15:18:34 +0100 |
| commit | 7551ae81e1a9d5bf14b434bce7528ac000d8afe1 (patch) | |
| tree | 9b70735fa8b915883bd349b533035deeec1722d6 | |
| parent | f7367b88e1c2cf1feca4d49f49b9616a5ad85a44 (diff) | |
| parent | 2da97b271b23225c394217ebc7b37999e34e345e (diff) | |
| download | bitcoin-7551ae81e1a9d5bf14b434bce7528ac000d8afe1.tar.xz | |
Merge bitcoin/bitcoin#23845: ci: use GCC 8 when building packages in native_qt5 CI
2da97b271b23225c394217ebc7b37999e34e345e ci: use GCC 8 when building packages in native_qt5 CI (fanquake)
Pull request description:
Our minimum required GCC is GCC 8, and this change in required for
PRs like #23839 which take advantage of flags introduced in that
version of GCC.
This should have been included as part of 182de7ba10811ec39e24ec5bec7cd2119f776f2f.
ACKs for top commit:
MarcoFalke:
cr ACK 2da97b271b23225c394217ebc7b37999e34e345e
hebasto:
ACK 2da97b271b23225c394217ebc7b37999e34e345e
Tree-SHA512: 2b64c21119fb95b959ac0f7d8d2d38f6ed98309695bb35425fad45b3b628247c2c78d0647c4d1f511669e8d333c6febe1cc44fac8027ed0bd7593eb630add548
| -rwxr-xr-x | ci/test/00_setup_env_native_qt5.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh index 14b7b98782..61451ad68c 100755 --- a/ci/test/00_setup_env_native_qt5.sh +++ b/ci/test/00_setup_env_native_qt5.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_qt5 export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic gcc-8 can compile our C++17 and run our functional tests in python3, see doc/dependencies.md export PACKAGES="gcc-8 g++-8 python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev" -export DEP_OPTS="NO_QT=1 NO_UPNP=1 NO_NATPMP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" +export DEP_OPTS="NO_QT=1 NO_UPNP=1 NO_NATPMP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1 CC=gcc-8 CXX=g++-8" 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 export RUN_UNIT_TESTS_SEQUENTIAL="true" export RUN_UNIT_TESTS="false" |