From 30d132ad75c8f7eb7a34de813351d451882d5084 Mon Sep 17 00:00:00 2001 From: Umut Date: Mon, 2 May 2022 09:54:21 +0200 Subject: [PATCH] chore: fix macOS dependency issue in AWS machines --- script/actions_utils/generate_test_matrix.py | 2 +- script/make_utils/setup_os_deps.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/script/actions_utils/generate_test_matrix.py b/script/actions_utils/generate_test_matrix.py index c461b10a6..b539f4af1 100644 --- a/script/actions_utils/generate_test_matrix.py +++ b/script/actions_utils/generate_test_matrix.py @@ -25,7 +25,7 @@ PUSH_TO_MAIN_CONF = {"os": PUSH_TO_MAIN_OSES, "python": PUSH_TO_MAIN_PYTHON_VERS WEEKLY_OSES = { LINUX: "ubuntu-20.04", - MACOS: "macos-10.15", + MACOS: "macos-11", } WEEKLY_PYTHON_VERSIONS = ["3.8", "3.9"] WEEKLY_CONF = {"os": WEEKLY_OSES, "python": WEEKLY_PYTHON_VERSIONS} diff --git a/script/make_utils/setup_os_deps.sh b/script/make_utils/setup_os_deps.sh index 83c2b7bad..0e52d4a83 100755 --- a/script/make_utils/setup_os_deps.sh +++ b/script/make_utils/setup_os_deps.sh @@ -74,7 +74,13 @@ if [[ "${OS_NAME}" == "Linux" ]]; then pip install --no-cache-dir poetry" eval "${SETUP_CMD}" elif [[ "${OS_NAME}" == "Darwin" ]]; then - brew install curl git graphviz jq make pandoc shellcheck + # Some problems with the git which is preinstalled on AWS virtual machines. Let's unlink it + # but not fail if it is not there, so use 'cat' as a hack to be sure that, even if set -x is + # activated later in this script, the status is still 0 == success + brew unlink git@2.35.1 | cat + brew install git + + brew install curl graphviz jq make pandoc shellcheck python3 -m pip install -U pip python3 -m pip install poetry