From 836d02722c3e555621a7d8faa4847f9897789b8e Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sat, 18 Dec 2021 13:39:43 +0200 Subject: [PATCH 1/2] ci: Bump the macOS image to the latest Monterey --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f35da3882e..55a11a2367 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -282,13 +282,13 @@ task: FILE_ENV: "./ci/test/00_setup_env_mac.sh" task: - name: 'macOS 11 native [gui, sqlite only] [no depends]' + name: 'macOS 12 native [gui, sqlite only] [no depends]' brew_install_script: - - brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt + - brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake gnu-getopt << : *GLOBAL_TASK_TEMPLATE osx_instance: # Use latest image, but hardcode version to avoid silent upgrades (and breaks) - image: big-sur-xcode-12.5 # https://cirrus-ci.org/guide/macOS + image: monterey-xcode-13.2 # https://cirrus-ci.org/guide/macOS env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV CI_USE_APT_INSTALL: "no" From 34fd25eaf0b7cb1e12bdc0f4c3f4a95e32a3434c Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sat, 18 Dec 2021 14:01:44 +0200 Subject: [PATCH 2/2] ci: Use system sqlite in native macOS task --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 55a11a2367..9ad96e2cdd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -282,9 +282,9 @@ task: FILE_ENV: "./ci/test/00_setup_env_mac.sh" task: - name: 'macOS 12 native [gui, sqlite only] [no depends]' + name: 'macOS 12 native [gui, system sqlite only] [no depends]' brew_install_script: - - brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake gnu-getopt + - brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt << : *GLOBAL_TASK_TEMPLATE osx_instance: # Use latest image, but hardcode version to avoid silent upgrades (and breaks)