sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #21112: ci: use Focal for macOS cross builds

Browse Source 
ac24af453d16afd1993fa1f292aa41ae6b16f138 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 ac24af453d16afd1993fa1f292aa41ae6b16f138

Tree-SHA512: 587ba5acf741bcefecf1bc262fa1177f565ebfa9de56125eca19ed3c7db7b9aabfb96866e9c140681b88cb7015a3ded2bc6b4b1b235543d6f6e9dfc6984d569f
This commit is contained in:
MarcoFalke 2021-02-09 08:00:27 +01:00 committed by Konstantin Akimov
parent 1995d2e7ca
commit c8653387b1
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -149,7 +149,7 @@ task:
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh" FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
task: task:
name: 'macOS 10.12 [gui, no tests] [bionic]' name: 'macOS 10.12 [gui, no tests] [focal]'
<< : *GLOBAL_TASK_TEMPLATE << : *GLOBAL_TASK_TEMPLATE
container: container:
image: ubuntu:focal image: ubuntu:focal

2
ci/test/00_setup_env_mac.sh
View File

@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
export CONTAINER_NAME=ci_macos_cross export CONTAINER_NAME=ci_macos_cross
export HOST=x86_64-apple-darwin export HOST=x86_64-apple-darwin
export PACKAGES="cmake libcap-dev libz-dev libbz2-dev python3-setuptools" export PACKAGES="cmake libcap-dev libz-dev libbz2-dev libtinfo5 python3-setuptools"
export XCODE_VERSION=12.2 export XCODE_VERSION=12.2
export XCODE_BUILD_ID=12B45b export XCODE_BUILD_ID=12B45b
export RUN_UNIT_TESTS=false export RUN_UNIT_TESTS=false