Skip to content

Commit c865338

Browse files
MarcoFalkeknst
authored andcommitted
Merge bitcoin#21112: ci: use Focal for macOS cross builds
ac24af4 ci: use Ubuntu Focal for macOS cross build (fanquake) Pull request description: I had assumed Cirrus was spinning up Docker containers to run the CI, however we are actaully running on the Cirrus machines themselves. See `DANGER_RUN_CI_ON_HOST` and in the logs: ```bash Running on host system without docker wrapper ``` So with this change we will actually be using Focal for the macOS cross build. Follow up to bitcoin#21036. This originally contained Windows changes, and an attempt to get Cirrus running without `DANGER_RUN_CI_ON_HOST`, however that seems non-trival, so Windows changes have been dropped from here for now. ACKs for top commit: MarcoFalke: cr ACK ac24af4 Tree-SHA512: 587ba5acf741bcefecf1bc262fa1177f565ebfa9de56125eca19ed3c7db7b9aabfb96866e9c140681b88cb7015a3ded2bc6b4b1b235543d6f6e9dfc6984d569f
1 parent 1995d2e commit c865338

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ task:
149149
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
150150

151151
task:
152-
name: 'macOS 10.12 [gui, no tests] [bionic]'
152+
name: 'macOS 10.12 [gui, no tests] [focal]'
153153
<< : *GLOBAL_TASK_TEMPLATE
154154
container:
155155
image: ubuntu:focal

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_macos_cross
1010
export HOST=x86_64-apple-darwin
11-
export PACKAGES="cmake libcap-dev libz-dev libbz2-dev python3-setuptools"
11+
export PACKAGES="cmake libcap-dev libz-dev libbz2-dev libtinfo5 python3-setuptools"
1212
export XCODE_VERSION=12.2
1313
export XCODE_BUILD_ID=12B45b
1414
export RUN_UNIT_TESTS=false

0 commit comments

Comments
 (0)