diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-03-29 15:51:03 +0200 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-04-11 14:12:37 +0200 |
| commit | fa4a46de0b3c1a5895e95dba7e95278932fbfc2c (patch) | |
| tree | 8aa6e8b75fd79ac3e475f0e45b0599df6d4b2aa0 | |
| parent | fabc7d90a90d46af181bc08def43d861062f6dfa (diff) | |
| download | bitcoin-fa4a46de0b3c1a5895e95dba7e95278932fbfc2c.tar.xz | |
ci: Bump nowallet_libbitcoinkernel task to ubuntu:focal
This is needed to work around
https://github.com/bitcoin/bitcoin/pull/27340#issuecomment-1484988445
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.
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index fc07c81cfb..680024d155 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -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 + CI_IMAGE_NAME_TAG: ubuntu:focal FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh" << : *CREDITS_TEMPLATE env: diff --git a/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh b/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh index 06bc2401c5..3fdb49765c 100755 --- a/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh +++ b/ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh @@ -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 |