aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-01-16 12:07:47 +0100
committerMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-01-16 12:07:53 +0100
commitdd04f2dda5fa9bd60a665ec11761669ca78421e8 (patch)
treedaf46d85e73fd8f7da0d74cce3ed36f07adc7847
parentffef91a5c18a6c369cf2deb70dd490d23ee62099 (diff)
parenta3db8bd7cad8562347d88006fd8e0149ee6a1e4d (diff)
Merge bitcoin/bitcoin#26879: [23.x] ci: replace Intel macOS CI job
a3db8bd7cad8562347d88006fd8e0149ee6a1e4d ci: Use `macos-ventura-xcode:14.1` image for "macOS native" task (Hennadii Stepanov) 53fd827883f9649f091999b59b0d916e0199c796 ci: Make `getopt` path architecture agnostic (Hennadii Stepanov) 6a5bb10da9d4ea87d94089ca260d278da9b889c0 ci: Improve naming related to "macOS 12 native x86_64" task (Hennadii Stepanov) 192759eb7bfc329e7d31f46d06986515e38af0b4 ci, refactor: Add `MACOS_NATIVE_TASK_TEMPLATE` (Hennadii Stepanov) Pull request description: Intel macOS jobs are no-longer available on Cirrus. Top commit has no ACKs. Tree-SHA512: dcd6832724ab4ed65d7b617903307e971fd9e27b40a093ec97efb211d352755d80b143985599ba530ff398e87c5bcd308e99aa248d89ffb5c3d1a02dadccd935
-rw-r--r--.cirrus.yml28
-rwxr-xr-xci/test/00_setup_env_mac_native_arm64.sh (renamed from ci/test/00_setup_env_mac_host.sh)7
-rwxr-xr-xci/test/04_install.sh2
3 files changed, 21 insertions, 16 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 2e81177d3a..b9e590a1c3 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -34,22 +34,30 @@ base_template: &BASE_TEMPLATE
main_template: &MAIN_TEMPLATE
timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out
+ ccache_cache:
+ folder: "/tmp/ccache_dir"
+ ci_script:
+ - ./ci/test_run_all.sh
+
+global_task_template: &GLOBAL_TASK_TEMPLATE
+ << : *BASE_TEMPLATE
container:
# https://cirrus-ci.org/faq/#are-there-any-limits
# Each project has 16 CPU in total, assign 2 to each container, so that 8 tasks run in parallel
cpu: 2
greedy: true
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
- ccache_cache:
- folder: "/tmp/ccache_dir"
depends_built_cache:
folder: "depends/built"
fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
- ci_script:
- - ./ci/test_run_all.sh
+ << : *MAIN_TEMPLATE
-global_task_template: &GLOBAL_TASK_TEMPLATE
+macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE
<< : *BASE_TEMPLATE
+ check_clang_script:
+ - clang --version
+ brew_install_script:
+ - brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
<< : *MAIN_TEMPLATE
compute_credits_template: &CREDITS_TEMPLATE
@@ -281,18 +289,16 @@ task:
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
task:
- name: 'macOS 12 native [gui, system sqlite only] [no depends]'
- brew_install_script:
- - brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
- << : *GLOBAL_TASK_TEMPLATE
+ name: 'macOS 13 native arm64 [gui, sqlite only] [no depends]'
macos_instance:
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
- image: monterey-xcode-13.2 # https://cirrus-ci.org/guide/macOS
+ image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1 # https://cirrus-ci.org/guide/macOS
+ << : *MACOS_NATIVE_TASK_TEMPLATE
env:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
CI_USE_APT_INSTALL: "no"
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
- FILE_ENV: "./ci/test/00_setup_env_mac_host.sh"
+ FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh"
task:
name: 'ARM64 Android APK [focal]'
diff --git a/ci/test/00_setup_env_mac_host.sh b/ci/test/00_setup_env_mac_native_arm64.sh
index d176296e76..cb0e13e77c 100755
--- a/ci/test/00_setup_env_mac_host.sh
+++ b/ci/test/00_setup_env_mac_native_arm64.sh
@@ -6,12 +6,11 @@
export LC_ALL=C.UTF-8
-export HOST=x86_64-apple-darwin
-export PIP_PACKAGES="zmq lief"
+export HOST=arm64-apple-darwin
+export PIP_PACKAGES="zmq"
export GOAL="install"
-export BITCOIN_CONFIG="--with-gui --enable-reduce-exports"
+export BITCOIN_CONFIG="--with-gui --with-miniupnpc --with-natpmp --enable-reduce-exports"
export CI_OS_NAME="macos"
export NO_DEPENDS=1
export OSX_SDK=""
export CCACHE_SIZE=300M
-export RUN_SECURITY_TESTS="true"
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index e409df62eb..2ee5868b40 100755
--- a/ci/test/04_install.sh
+++ b/ci/test/04_install.sh
@@ -13,7 +13,7 @@ fi
if [ "$CI_OS_NAME" == "macos" ]; then
sudo -H pip3 install --upgrade pip
# shellcheck disable=SC2086
- IN_GETOPT_BIN="/usr/local/opt/gnu-getopt/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
+ IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
fi
# Create folders that are mounted into the docker