Skip to content

Commit 956797f

Browse files
authored
Merge pull request #1467 from psgreco/master-fix-msan-mac
Fix MSAN and MACOS native tests
2 parents 209032c + 8057526 commit 956797f

File tree

6 files changed

+3575
-3
lines changed

6 files changed

+3575
-3
lines changed

.cirrus.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE
5858
check_clang_script:
5959
- clang --version
6060
brew_install_script:
61-
- brew install boost libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
61+
- brew install [email protected] libevent qt@5 miniupnpc libnatpmp ccache zeromq qrencode libtool automake gnu-getopt
62+
- brew link --force --overwrite [email protected]
6263
<< : *MAIN_TEMPLATE
6364

6465
compute_credits_template: &CREDITS_TEMPLATE

ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
1111
fi
1212

1313
if [ "$CI_OS_NAME" == "macos" ]; then
14-
sudo -H pip3 install --upgrade pip
14+
sudo -H pip3 install --upgrade --break-system-packages pip
1515
# shellcheck disable=SC2086
1616
IN_GETOPT_BIN="$(brew --prefix gnu-getopt)/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
1717
fi

0 commit comments

Comments
 (0)