Skip to content

Commit 3641ec1

Browse files
author
MarcoFalke
committed
Merge #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 #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
2 parents 19b1ced + ac24af4 commit 3641ec1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ task:
160160
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
161161

162162
task:
163-
name: 'macOS 10.14 [gui, no tests] [bionic]'
163+
name: 'macOS 10.14 [gui, no tests] [focal]'
164164
<< : *GLOBAL_TASK_TEMPLATE
165165
container:
166-
image: ubuntu:bionic
166+
image: ubuntu:focal
167167
env:
168168
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
169169

ci/test/00_setup_env_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
99
export CONTAINER_NAME=ci_macos_cross
1010
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well)
1111
export HOST=x86_64-apple-darwin18
12-
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools xorriso"
12+
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso"
1313
export XCODE_VERSION=11.3.1
1414
export XCODE_BUILD_ID=11C505
1515
export RUN_UNIT_TESTS=false

0 commit comments

Comments
 (0)