Skip to content

Commit dc600c2

Browse files
committed
ci, qml: Add required Qt Quick dev packages
Buster has been replaced with bullseye for system Qt 5.15. Compiler versions: - buster: 8.3.0-6 - bullseye: 9.3.0-22
1 parent 43e2bc9 commit dc600c2

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,12 @@ task:
232232
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
233233

234234
task:
235-
name: '[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [buster]'
235+
name: '[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [bullseye]'
236236
previous_releases_cache:
237237
folder: "releases"
238238
<< : *GLOBAL_TASK_TEMPLATE
239239
container:
240-
image: ubuntu:bionic
240+
image: debian:bullseye
241241
env:
242242
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
243243
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"

ci/test/00_setup_env_native_asan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ else
1919
fi
2020

2121
export CONTAINER_NAME=ci_native_asan
22-
export PACKAGES="systemtap-sdt-dev clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
22+
export PACKAGES="systemtap-sdt-dev clang llvm python3-zmq qtbase5-dev qttools5-dev-tools qtdeclarative5-dev qtquickcontrols2-5-dev libevent-dev bsdmainutils libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
2323
export CI_IMAGE_NAME_TAG=ubuntu:22.04
2424
export NO_DEPENDS=1
2525
export GOAL="install"

ci/test/00_setup_env_native_qt5.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_qt5
10-
export CI_IMAGE_NAME_TAG=debian:buster
11-
# Use minimum supported python3.7 and gcc-8, see doc/dependencies.md
12-
export PACKAGES="gcc-8 g++-8 python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
13-
export DEP_OPTS="NO_QT=1 NO_UPNP=1 NO_NATPMP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1 CC=gcc-8 CXX=g++-8"
10+
export CI_IMAGE_NAME_TAG=debian:bullseye # System Qt 5.15 is required for QML GUI.
11+
export PACKAGES="gcc-9 g++-9 python3-zmq qtbase5-dev qttools5-dev-tools qtdeclarative5-dev qtquickcontrols2-5-dev libdbus-1-dev libharfbuzz-dev"
12+
export DEP_OPTS="NO_QT=1 NO_UPNP=1 NO_NATPMP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1 CC=gcc-9 CXX=g++-9"
1413
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
1514
export RUN_UNIT_TESTS_SEQUENTIAL="true"
1615
export RUN_UNIT_TESTS="false"
1716
export GOAL="install"
1817
export DOWNLOAD_PREVIOUS_RELEASES="true"
1918
export BITCOIN_CONFIG="--enable-zmq --with-libs=no --with-gui=qt5 --enable-reduce-exports \
20-
--enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\" CC=gcc-8 CXX=g++-8"
19+
--enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\" CC=gcc-9 CXX=g++-9"

0 commit comments

Comments
 (0)