Skip to content

Commit

Permalink
ci: Bump nowallet_libbitcoinkernel task to ubuntu:focal
Browse files Browse the repository at this point in the history
This is needed to work around
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.
  • Loading branch information
MarcoFalke committed Mar 31, 2023
1 parent fa1d802 commit fa9606b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -303,11 +303,11 @@ task:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

task:
name: '[no wallet, libbitcoinkernel] [buster]'
name: '[no wallet, libbitcoinkernel] [focal]'
<< : *GLOBAL_TASK_TEMPLATE
container:
docker_arguments:
CI_IMAGE_NAME_TAG: debian:buster-20191224 # Use ancient tag to work around https://github.com/bitcoin/bitcoin/pull/27340#issuecomment-1484988445
CI_IMAGE_NAME_TAG: ubuntu:focal
FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh"
<< : *CREDITS_TEMPLATE
env:
Expand Down
7 changes: 3 additions & 4 deletions ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
export LC_ALL=C.UTF-8

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

0 comments on commit fa9606b

Please sign in to comment.