diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69403682..ff961c7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,18 +21,18 @@ jobs: fail-fast: false matrix: include: - #- name: ubu22-x86-gcc12-clang17 - # os: ubuntu-22.04 - # compiler: gcc-12 - # clang-runtime: '17' - # cling: Off - # cppyy: On - #- name: ubu22-x86-gcc12-clang16 - # os: ubuntu-22.04 - # compiler: gcc-12 - # clang-runtime: '16' - # cling: Off - # cppyy: On + - name: ubu22-x86-gcc12-clang17 + os: ubuntu-22.04 + compiler: gcc-12 + clang-runtime: '17' + cling: Off + cppyy: On + - name: ubu22-x86-gcc12-clang16 + os: ubuntu-22.04 + compiler: gcc-12 + clang-runtime: '16' + cling: Off + cppyy: On - name: ubu22-x86-gcc12-cling os: ubuntu-22.04 compiler: gcc-12 @@ -40,18 +40,18 @@ jobs: cling: On cling-version: '1.0' cppyy: On - #- name: osx13-x86-clang-clang17 - # os: macos-13 - # compiler: clang - # clang-runtime: '17' - # cling: Off - # cppyy: On - #- name: osx13-x86-clang-clang16 - # os: macos-13 - # compiler: clang - # clang-runtime: '16' - # cling: Off - # cppyy: On + - name: osx13-x86-clang-clang17 + os: macos-13 + compiler: clang + clang-runtime: '17' + cling: Off + cppyy: On + - name: osx13-x86-clang-clang16 + os: macos-13 + compiler: clang + clang-runtime: '16' + cling: Off + cppyy: On - name: osx13-x86-clang-cling os: macos-13 compiler: clang @@ -59,18 +59,18 @@ jobs: cling: On cling-version: '1.0' cppyy: On - #- name: osx14-arm-clang-clang17 - # os: macos-14 - # compiler: clang - # clang-runtime: '17' - # cling: Off - # cppyy: On - #- name: osx14-arm-clang-clang16 - # os: macos-14 - # compiler: clang - # clang-runtime: '16' - # cling: Off - # cppyy: On + - name: osx14-arm-clang-clang17 + os: macos-14 + compiler: clang + clang-runtime: '17' + cling: Off + cppyy: On + - name: osx14-arm-clang-clang16 + os: macos-14 + compiler: clang + clang-runtime: '16' + cling: Off + cppyy: On - name: osx14-arm-clang-cling os: macos-14 compiler: clang @@ -192,14 +192,14 @@ jobs: fi pip install distro pytest - #- name: Restore Cache LLVM/Clang runtime build directory - # uses: actions/cache/restore@v3 - # id: cache - # with: - # path: | - # clang-dev - # ${{ matrix.cling=='On' && 'cling' || '' }} - # key: ${{ env.CLING_HASH }}-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}-clang-${{ matrix.clang-runtime }}.x-patch-${{ hashFiles(format('patches/llvm/clang{0}-*.patch', matrix.clang-runtime)) || 'none' }} + - name: Restore Cache LLVM/Clang runtime build directory + uses: actions/cache/restore@v3 + id: cache + with: + path: | + clang-dev + ${{ matrix.cling=='On' && 'cling' || '' }} + key: ${{ env.CLING_HASH }}-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}-clang-${{ matrix.clang-runtime }}.x-patch-${{ hashFiles(format('patches/llvm/clang{0}-*.patch', matrix.clang-runtime)) || 'none' }} - name: Build runtime LLVM/Clang on Linux if the cache is invalid if: ${{ runner.os != 'windows' && steps.cache.outputs.cache-hit != 'true' }} diff --git a/README.md b/README.md index acc6f80f..2bab251d 100644 --- a/README.md +++ b/README.md @@ -81,13 +81,14 @@ mkdir CppInterOp/build cd CppInterOp/build cmake -DBUILD_SHARED_LIBS=ON -DUSE_CLING=Off -DUSE_REPL=ON -DLLVM_DIR=$LLVM_DIR/build/lib/cmake/llvm -DClang_DIR=$LLVM_DIR/build/lib/cmake/clang .. cmake --build . --parallel $(nproc --all) -cd ../.. +CPPINTEROP_BUILD_DIR=$PWD +cd ../../xeus-clang-repl mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DLLVM_CMAKE_DIR=$LLVM_BUILD_DIR \ - -DCMAKE_PREFIX_PATH=$(python -m site --user-site) \ - -DCMAKE_INSTALL_PREFIX=$(python -m site --user-site) \ + -DCMAKE_PREFIX_PATH=$(conda info --base) \ + -DCMAKE_INSTALL_PREFIX=$(conda info --base) \ -DCMAKE_INSTALL_LIBDIR=lib \ -DLLVM_CONFIG_EXTRA_PATH_HINTS=$LLVM_BUILD_DIR/lib \ -DCPPINTEROP_DIR=$CPPINTEROP_BUILD_DIR \