Skip to content

Commit ea4f68a

Browse files
committed
ci: Replace bionic with hirsute for system Qt 5.15.2
Compiler versions: - bionic: 8.4.0-1ubuntu1 - hirsute: 8.4.0-7ubuntu3
1 parent 743e9cf commit ea4f68a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ task:
200200
# FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
201201

202202
task:
203-
name: '[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [bionic]'
203+
name: '[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [hirsute]'
204204
previous_releases_cache:
205205
folder: "releases"
206206
<< : *GLOBAL_TASK_TEMPLATE
207207
container:
208-
image: ubuntu:bionic
208+
image: ubuntu:hirsute
209209
env:
210210
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
211211
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"

ci/test/00_setup_env_native_qt5.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_qt5
10-
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
10+
export DOCKER_NAME_TAG=ubuntu:21.04 # Check that hirsute gcc-8 can compile our C++17 and run our functional tests in python3, see doc/dependencies.md
1111
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 CC=gcc-8 CXX=g++-8"
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

0 commit comments

Comments
 (0)