From a9a1d28bf018ee7370e951ec371f0d4893a463a1 Mon Sep 17 00:00:00 2001 From: rina Date: Fri, 5 Apr 2024 12:11:37 +1000 Subject: [PATCH] fix ci nix overrides CXX variable when entering shell, predictably --- .github/workflows/test.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 63063007..b3504cb5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,11 +34,8 @@ jobs: echo "OUTPUT=$(pwd)/_build/default/tests/coverage" >> $GITHUB_OUTPUT rm -rf _build/default/tests/coverage/encodings id: coverage - - run: sudo apt-get update && sudo apt-get install clang-15 lld-15 llvm-15 meson ninja-build - - run: offlineASL-cpp/build.sh - env: - CXX: "/usr/lib/llvm-15/bin/clang++" - # CXX_LD: "/usr/bin/ld.lld-15" + - run: sudo apt-get update && sudo apt-get install clang-15 lld-15 llvm-15 llvm-15-dev meson ninja-build + - run: "CXX=$(which clang++15) LLVM_CONFIG=$(which llvm-config-15) offlineASL-cpp/build.sh" - name: Upload new coverage results if: always()