Skip to content

Commit ec89d70

Browse files
committed
Merge #54: ci: Add required Qt Quick dev packages
65ad0c1 ci, qml: Add required Qt Quick dev packages (Hennadii Stepanov) Pull request description: This PR fixes the following CI tasks: - "[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [bionic]" - "[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [hirsute]" ACKs for top commit: promag: ACK 65ad0c1. Tree-SHA512: 82fc46446a87cf4814a9f7c380265fdbe6400cc90b5aaf92cbfb633484d30843d7339c7cd2fa02f4594a884cd2a6bfe06236ce53d0aa2fba5f2d3b6189b79e64
2 parents 2f2ddfe + 65ad0c1 commit ec89d70

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ci/test/00_setup_env_native_asan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_asan
10-
export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev"
10+
export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools qtdeclarative5-dev qtquickcontrols2-5-dev libevent-dev bsdmainutils libboost-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev"
1111
export DOCKER_NAME_TAG=ubuntu:hirsute
1212
export NO_DEPENDS=1
1313
export GOAL="install"

ci/test/00_setup_env_native_qt5.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_qt5
1010
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
11-
export PACKAGES="gcc-8 g++-8 python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
11+
export PACKAGES="gcc-8 g++-8 python3-zmq qtbase5-dev qttools5-dev-tools qtdeclarative5-dev qtquickcontrols2-5-dev libdbus-1-dev libharfbuzz-dev"
1212
export DEP_OPTS="NO_QT=1 NO_UPNP=1 NO_NATPMP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1"
1313
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
1414
export RUN_UNIT_TESTS_SEQUENTIAL="true"

0 commit comments

Comments
 (0)