summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorCarlo Cabrera <github@carlo.cab>2024-12-21 01:28:15 +0800
committerEli Schwartz <eschwartz93@gmail.com>2024-12-20 14:15:30 -0500
commit0025805e303623386f1134b5f5f646bb40b00186 (patch)
treea6120108b77e8758e87ac5f8c22abe3db20ebd23 /.github
parente9e582020898e52d17b4c48afe65589bc1dee065 (diff)
downloadmeson-0025805e303623386f1134b5f5f646bb40b00186.tar.gz
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.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/macos.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 88acbef90..f5a87c957 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