Skip to content

Commit 3333d69

Browse files
author
MarcoFalke
committed
ci: Run macos ci config on cirrus
1 parent fa8b111 commit 3333d69

File tree

4 files changed

+16
-27
lines changed

4 files changed

+16
-27
lines changed

.cirrus.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ container:
88
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
99
kvm: true # Use kvm to avoid spurious CI failures in the default virtualization cluster, see https://github.com/bitcoin/bitcoin/issues/20093
1010
env:
11-
PACKAGE_MANAGER_INSTALL : "apt-get update && apt-get install -y"
11+
PACKAGE_MANAGER_INSTALL: "apt-get update && apt-get install -y"
1212
MAKEJOBS: "-j4"
1313
DANGER_RUN_CI_ON_HOST: "1" # Containers will be discarded after the run, so there is no risk that the ci scripts modify the system
1414
TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache
@@ -127,3 +127,17 @@ task:
127127
image: ubuntu:bionic
128128
env:
129129
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
130+
131+
task:
132+
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
133+
macos_brew_addon_script:
134+
- brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
135+
<< : *GLOBAL_TASK_TEMPLATE
136+
osx_instance:
137+
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
138+
image: catalina-xcode-12.1 # https://cirrus-ci.org/guide/macOS
139+
env:
140+
DANGER_RUN_CI_ON_HOST: "true"
141+
CI_USE_APT_INSTALL: "no"
142+
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
143+
FILE_ENV: "./ci/test/00_setup_env_mac_host.sh"

.travis.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,3 @@ jobs:
7979
name: 'x86_64 Linux [GOAL: install] [xenial] [no wallet]'
8080
env: >-
8181
FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh"
82-
83-
- stage: test
84-
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
85-
os: osx
86-
# Use the most recent version:
87-
# Xcode 11.3.1, macOS 10.14, SDK 10.15
88-
# https://docs.travis-ci.com/user/reference/osx/#macos-version
89-
osx_image: xcode11.3
90-
addons:
91-
homebrew:
92-
packages:
93-
- berkeley-db4
94-
- miniupnpc
95-
- qrencode
96-
- sqlite
97-
- ccache
98-
- zeromq
99-
env: >-
100-
DANGER_RUN_CI_ON_HOST=true
101-
CI_USE_APT_INSTALL=no
102-
FILE_ENV="./ci/test/00_setup_env_mac_host.sh"

ci/test/00_setup_env_mac_host.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,3 @@ export OSX_SDK=""
1616
export CCACHE_SIZE=300M
1717

1818
export RUN_SECURITY_TESTS="true"
19-
if [ "$TRAVIS_REPO_SLUG" != "bitcoin/bitcoin" ]; then
20-
export RUN_FUNCTIONAL_TESTS="false"
21-
export EXPECTED_TESTS_DURATION_IN_SECONDS=200
22-
fi

ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
1414
fi
1515

1616
if [ "$CI_OS_NAME" == "macos" ]; then
17-
${CI_RETRY_EXE} pip3 install $PIP_PACKAGES
17+
IN_GETOPT_BIN="/usr/local/opt/gnu-getopt/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
1818
fi
1919

2020
# Create folders that are mounted into the docker

0 commit comments

Comments
 (0)