diff options
author | fanquake <fanquake@gmail.com> | 2021-02-09 13:58:59 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-02-09 13:58:59 +0800 |
commit | ac24af453d16afd1993fa1f292aa41ae6b16f138 (patch) | |
tree | 0ad01a242a42245a4e5d0be9ca696cc65b68c099 | |
parent | d8646966497f1e21c3b1aad7d9bdddc3d6229383 (diff) | |
download | bitcoin-ac24af453d16afd1993fa1f292aa41ae6b16f138.tar.xz |
ci: use Ubuntu Focal for macOS cross build
-rw-r--r-- | .cirrus.yml | 4 | ||||
-rw-r--r-- | ci/test/00_setup_env_mac.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 801164c368..1eabca1b8b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -160,10 +160,10 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh" task: - name: 'macOS 10.14 [gui, no tests] [bionic]' + name: 'macOS 10.14 [gui, no tests] [focal]' << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:bionic + image: ubuntu:focal env: FILE_ENV: "./ci/test/00_setup_env_mac.sh" diff --git a/ci/test/00_setup_env_mac.sh b/ci/test/00_setup_env_mac.sh index 7075484bd5..6da011d19b 100644 --- a/ci/test/00_setup_env_mac.sh +++ b/ci/test/00_setup_env_mac.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_macos_cross export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well) export HOST=x86_64-apple-darwin18 -export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools xorriso" +export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso" export XCODE_VERSION=11.3.1 export XCODE_BUILD_ID=11C505 export RUN_UNIT_TESTS=false |