Skip to content

Commit 6fade99

Browse files
committed
Revert "Manually backport macos CI from bitcoin 24"
This reverts commit 67df486.
1 parent 67df486 commit 6fade99

File tree

3 files changed

+10
-23
lines changed

3 files changed

+10
-23
lines changed

.cirrus.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,18 @@ task:
201201
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
202202

203203
task:
204-
name: 'macOS 13 native arm64 [gui, sqlite only] [no depends]'
204+
name: 'macOS 11 native [gui] [no depends]'
205205
brew_install_script:
206-
- brew install boost libevent berkeley-db@4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
206+
- brew install boost libevent berkeley-db4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
207207
<< : *GLOBAL_TASK_TEMPLATE
208-
macos_instance:
208+
osx_instance:
209209
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
210-
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1 # https://cirrus-ci.org/guide/macOS
210+
image: big-sur-xcode-12.5 # https://cirrus-ci.org/guide/macOS
211211
env:
212212
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
213213
CI_USE_APT_INSTALL: "no"
214214
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
215-
FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh"
215+
FILE_ENV: "./ci/test/00_setup_env_mac_host.sh"
216216

217217
task:
218218
name: 'ARM64 Android APK [focal]'

ci/test/00_setup_env_mac_native_arm64.sh

-18
This file was deleted.

ci/test/04_install.sh

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
1010
export LC_ALL=C
1111
fi
1212

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+
1318
# Create folders that are mounted into the docker
1419
mkdir -p "${CCACHE_DIR}"
1520
mkdir -p "${PREVIOUS_RELEASES_DIR}"

0 commit comments

Comments
 (0)