From d68acad3de0d00972a419ef2353fcc26a99bbd8b Mon Sep 17 00:00:00 2001 From: JCGoran Date: Wed, 8 Jan 2025 13:59:56 +0100 Subject: [PATCH] Fix CI failure on MacOS and Windows (#3303) --- .github/workflows/neuron-ci.yml | 2 ++ ci/win_install_deps.cmd | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/neuron-ci.yml b/.github/workflows/neuron-ci.yml index adcf08c3b7..3701d00e2e 100644 --- a/.github/workflows/neuron-ci.yml +++ b/.github/workflows/neuron-ci.yml @@ -125,6 +125,8 @@ jobs: brew install cmake echo "$(brew --prefix)/opt/cmake/bin" >> $GITHUB_PATH fi + # workaround for fmt 11.1 (see https://github.com/gabime/spdlog/pull/3312) + brew unlink fmt echo "$(brew --prefix)/opt/flex/bin:$(brew --prefix)/opt/bison/bin" >> $GITHUB_PATH # Core https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories if [[ "${{matrix.os}}" == "macOS-13" ]]; then diff --git a/ci/win_install_deps.cmd b/ci/win_install_deps.cmd index 82a8c950d1..e9fab1e959 100644 --- a/ci/win_install_deps.cmd +++ b/ci/win_install_deps.cmd @@ -66,10 +66,10 @@ mingw-w64-x86_64-cmake ^ mingw-w64-x86_64-ninja ^ mingw-w64-x86_64-ncurses ^ mingw-w64-x86_64-readline ^ -mingw-w64-x86_64-python3 ^ +mingw-w64-x86_64-python ^ mingw-w64-x86_64-python-setuptools ^ -mingw-w64-x86_64-python3-packaging ^ -mingw-w64-x86_64-python3-pip ^ +mingw-w64-x86_64-python-packaging ^ +mingw-w64-x86_64-python-pip ^ mingw64/mingw-w64-x86_64-dlfcn ^ mingw-w64-x86_64-toolchain || goto :error