diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-10-25 09:49:16 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-01-16 11:05:15 +0000 |
| commit | a3db8bd7cad8562347d88006fd8e0149ee6a1e4d (patch) | |
| tree | daf46d85e73fd8f7da0d74cce3ed36f07adc7847 | |
| parent | 53fd827883f9649f091999b59b0d916e0199c796 (diff) | |
ci: Use `macos-ventura-xcode:14.1` image for "macOS native" task
Github-Pull: #26388
Rebased-From: da168934741b776bce07d5503ca2344d300723b3
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_mac_native_arm64.sh (renamed from ci/test/00_setup_env_mac_native_x86_64.sh) | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1f7c28381e..b9e590a1c3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -289,16 +289,16 @@ task: FILE_ENV: "./ci/test/00_setup_env_mac.sh" task: - name: 'macOS 12 native x86_64 [gui, system sqlite] [no depends]' + 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.3 # 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_native_x86_64.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_native_x86_64.sh b/ci/test/00_setup_env_mac_native_arm64.sh index d176296e76..cb0e13e77c 100755 --- a/ci/test/00_setup_env_mac_native_x86_64.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" |