Skip to content

Commit

Permalink
Update ci.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
mcbarton authored Jan 23, 2024
1 parent 7d633c0 commit cbe6b81
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,14 @@ jobs:
cmake --build . --target clang clang-repl --parallel ${{ env.ncpus }}
fi
cd ../../
cp -r -v ./llvm-project/ ./cppyy-backend/
OS=$(uname -s)
if [[ "$OS" == "Darwin" ]]; then
mkdir ./cppyy-backend/llvm-project/
cp -r ./llvm-project/ ./cppyy-backend/llvm-project/
else
cp ./llvm-project/ ./cppyy-backend/
fi
echo "Copy llvm-project folder to cppyy-backend for caching"
- name: Build LLVM/Cling on Windows systems if the cache is invalid
Expand Down Expand Up @@ -557,6 +564,15 @@ jobs:
LLVM_BUILD_DIR="$(pwd)/llvm-project/build"
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
if [[ "${cling_on}" == "ON" ]]; then
FIXME: Currently Cling directory not found if using cache, so cloning again, until reason why is found.
if [[ steps.cache.outputs.cache-hit == 'true' ]]; then
git clone https://github.com/root-project/cling.git
cd ./cling
git checkout tags/v${{ matrix.cling-version }}
cd ..
fi
CLING_DIR="$(pwd)/cling"
CLING_BUILD_DIR="$(pwd)/cling/build"
CPLUS_INCLUDE_PATH="${CLING_DIR}/tools/cling/include:${CLING_BUILD_DIR}/include:${LLVM_DIR}/llvm/include:${LLVM_DIR}/clang/include:${LLVM_BUILD_DIR}/include:${LLVM_BUILD_DIR}/tools/clang/include:$PWD/include"
Expand Down

0 comments on commit cbe6b81

Please sign in to comment.