File tree Expand file tree Collapse file tree 4 files changed +16
-27
lines changed Expand file tree Collapse file tree 4 files changed +16
-27
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ container:
8
8
memory : 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
9
9
kvm : true # Use kvm to avoid spurious CI failures in the default virtualization cluster, see https://github.com/bitcoin/bitcoin/issues/20093
10
10
env :
11
- PACKAGE_MANAGER_INSTALL : " apt-get update && apt-get install -y"
11
+ PACKAGE_MANAGER_INSTALL : " apt-get update && apt-get install -y"
12
12
MAKEJOBS : " -j4"
13
13
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
14
14
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:
127
127
image : ubuntu:bionic
128
128
env :
129
129
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"
Original file line number Diff line number Diff line change 79
79
name : ' x86_64 Linux [GOAL: install] [xenial] [no wallet]'
80
80
env : >-
81
81
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"
Original file line number Diff line number Diff line change @@ -16,7 +16,3 @@ export OSX_SDK=""
16
16
export CCACHE_SIZE=300M
17
17
18
18
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
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
14
14
fi
15
15
16
16
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
18
18
fi
19
19
20
20
# Create folders that are mounted into the docker
You can’t perform that action at this time.
0 commit comments