From 3f6c47e90469368484df9dbbcf387f06194d80d8 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera Date: Sat, 21 Dec 2024 01:28:15 +0800 Subject: [PATCH] Prioritise Apple's toolchain in project-tests-appleclang Using Homebrew Clang leads to failures when testing objfw. We probably want to ensure we use Apple Clang here given the workflow job name, in any case. --- .github/workflows/macos.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 88acbef90206..f5a87c957160 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -110,7 +110,9 @@ jobs: # These cannot evaluate anything, so we cannot set PATH or SDKROOT here run: | export SDKROOT="$(xcodebuild -version -sdk macosx Path)" - export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/llvm/bin:/opt/homebrew/opt/ncurses/bin:$PATH" + # Append LLVM's bin directory to PATH to prioritise Apple Clang over Homebrew Clang. + # We need this to avoid objfw test failures. + export PATH="$HOME/tools:/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/ncurses/bin:$PATH:/opt/homebrew/opt/llvm/bin" export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@5/lib/pkgconfig:/opt/homebrew/opt/lapack/lib/pkgconfig:/opt/homebrew/opt/ncurses/lib/pkgconfig:$PKG_CONFIG_PATH" ./tools/run_with_cov.py ./run_project_tests.py --backend=ninja