Skip to content

Commit fa4a46d

Browse files
author
MarcoFalke
committed
ci: Bump nowallet_libbitcoinkernel task to ubuntu:focal
This is needed to work around bitcoin/bitcoin#27340 (comment) The only change should be that python3.7 is bumped to 3.8, but this is fine because ci/test/00_setup_env_native_qt5.sh still checks for python3.7 compatibility.
1 parent fabc7d9 commit fa4a46d

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,11 @@ task:
303303
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
304304

305305
task:
306-
name: '[no wallet, libbitcoinkernel] [buster]'
306+
name: '[no wallet, libbitcoinkernel] [focal]'
307307
<< : *GLOBAL_TASK_TEMPLATE
308308
container:
309309
docker_arguments:
310-
CI_IMAGE_NAME_TAG: debian:buster
310+
CI_IMAGE_NAME_TAG: ubuntu:focal
311311
FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh"
312312
<< : *CREDITS_TEMPLATE
313313
env:

ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh

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

99
export CONTAINER_NAME=ci_native_nowallet_libbitcoinkernel
10-
export CI_IMAGE_NAME_TAG=debian:buster
11-
# Use minimum supported python3.7 and clang-8, see doc/dependencies.md
12-
export PACKAGES="-t buster-backports python3-zmq clang-8 llvm-8 libc++abi-8-dev libc++-8-dev"
13-
export APPEND_APT_SOURCES_LIST="deb http://deb.debian.org/debian buster-backports main"
10+
export CI_IMAGE_NAME_TAG=ubuntu:focal
11+
# Use minimum supported python3.7 (or python3.8, as best-effort) and clang-8, see doc/dependencies.md
12+
export PACKAGES="python3-zmq clang-8 llvm-8 libc++abi-8-dev libc++-8-dev"
1413
export DEP_OPTS="NO_WALLET=1 CC=clang-8 CXX='clang++-8 -stdlib=libc++'"
1514
export GOAL="install"
1615
export NO_WERROR=1

0 commit comments

Comments
 (0)