File tree 3 files changed +23
-10
lines changed
3 files changed +23
-10
lines changed Original file line number Diff line number Diff line change @@ -201,18 +201,18 @@ task:
201
201
FILE_ENV : " ./ci/test/00_setup_env_mac.sh"
202
202
203
203
task :
204
- name : ' macOS 11 native [gui] [no depends]'
204
+ name : ' macOS 13 native arm64 [gui, sqlite only ] [no depends]'
205
205
brew_install_script :
206
- - brew install boost libevent berkeley-db4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
206
+ - brew install boost libevent berkeley-db@4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
207
207
<< : *GLOBAL_TASK_TEMPLATE
208
- osx_instance :
208
+ macos_instance :
209
209
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
210
- image : big-sur -xcode-12.5 # https://cirrus-ci.org/guide/macOS
210
+ image : ghcr.io/cirruslabs/macos-ventura -xcode:14.1 # https://cirrus-ci.org/guide/macOS
211
211
env :
212
212
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
213
213
CI_USE_APT_INSTALL : " no"
214
214
PACKAGE_MANAGER_INSTALL : " echo" # Nothing to do
215
- FILE_ENV : " ./ci/test/00_setup_env_mac_host .sh"
215
+ FILE_ENV : " ./ci/test/00_setup_env_mac_native_arm64 .sh"
216
216
217
217
task :
218
218
name : ' ARM64 Android APK [focal]'
Original file line number Diff line number Diff line change
1
+ #! /usr/bin/env bash
2
+ #
3
+ # Copyright (c) 2019-2020 The Bitcoin Core developers
4
+ # Distributed under the MIT software license, see the accompanying
5
+ # file COPYING or http://www.opensource.org/licenses/mit-license.php.
6
+
7
+ export LC_ALL=C.UTF-8
8
+
9
+ export HOST=arm64-apple-darwin
10
+ export PIP_PACKAGES=" zmq"
11
+ export GOAL=" install"
12
+ # ELEMENTS: add -fno-stack-check to work around clang bug on macos
13
+ export BITCOIN_CONFIG=" --with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports CXXFLAGS=-fno-stack-check"
14
+ export CI_OS_NAME=" macos"
15
+ export NO_DEPENDS=1
16
+ export OSX_SDK=" "
17
+ export CCACHE_SIZE=300M
18
+ export PATH=" /opt/homebrew/opt/gnu-getopt/bin:$PATH "
Original file line number Diff line number Diff line change @@ -10,11 +10,6 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
10
10
export LC_ALL=C
11
11
fi
12
12
13
- if [ " $CI_OS_NAME " == " macos" ]; then
14
- sudo -H pip3 install --upgrade pip
15
- IN_GETOPT_BIN=" /usr/local/opt/gnu-getopt/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
16
- fi
17
-
18
13
# Create folders that are mounted into the docker
19
14
mkdir -p " ${CCACHE_DIR} "
20
15
mkdir -p " ${PREVIOUS_RELEASES_DIR} "
You can’t perform that action at this time.
0 commit comments