Skip to content

Commit 773323f

Browse files
committed
Try switching to llvm17
1 parent ad94a0a commit 773323f

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- name: ubu22-gcc12-clang16
24+
- name: ubu22-gcc12-clang17
2525
os: ubuntu-22.04
2626
compiler: gcc-12
27-
clang-runtime: '16'
27+
clang-runtime: '17'
2828
steps:
2929
- uses: actions/checkout@v3
3030
with:
@@ -188,8 +188,7 @@ jobs:
188188
-DCMAKE_INSTALL_LIBDIR=lib -DLLVM_DIR=$PATH_TO_LLVM_BUILD \
189189
-DLLVM_CONFIG_EXTRA_PATH_HINTS=$PATH_TO_LLVM_BUILD \
190190
-DCPPINTEROP_DIR=$CPPINTEROP_BUILD_DIR \
191-
-DLLVM_USE_LINKER=gold \
192-
-DLLVM_REQUIRED_VERSION=${{ matrix.clang-runtime }} ..
191+
-DLLVM_USE_LINKER=gold ..
193192
make install
194193
- name: Setup tmate session
195194
if: ${{ failure() }}

Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ ENV LC_ALL=en_US.UTF-8 \
6060

6161
USER ${NB_UID}
6262

63-
ENV LLVM_REQUIRED_VERSION=16
64-
6563
# Copy git repository to home directory of container
6664
COPY --chown=${NB_UID}:${NB_GID} . "${HOME}"/
6765

@@ -124,7 +122,6 @@ RUN \
124122
# notebook, jpyterhub, jupyterlab are inherited from base-notebook container image
125123
# Other "our" conda installs
126124
cmake \
127-
#"clangdev=$LLVM_REQUIRED_VERSION" \
128125
'xeus>=2.0,<3.0' \
129126
'nlohmann_json>=3.9.1,<3.10' \
130127
'cppzmq>=4.6.0,<5' \
@@ -294,7 +291,7 @@ RUN \
294291
export CPLUS_INCLUDE_PATH="/home/jovyan/clad/include:$CPLUS_INCLUDE_PATH" && \
295292
echo "export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH" >> ~/.profile && \
296293
##echo "conda activate .venv" >> ~/.profile
297-
cmake -DCMAKE_BUILD_TYPE=Debug -DLLVM_CMAKE_DIR=$PATH_TO_LLVM_BUILD -DCMAKE_PREFIX_PATH=$KERNEL_PYTHON_PREFIX -DCMAKE_INSTALL_PREFIX=$KERNEL_PYTHON_PREFIX -DCMAKE_INSTALL_LIBDIR=lib -DLLVM_CONFIG_EXTRA_PATH_HINTS=${PATH_TO_LLVM_BUILD}/lib -DCPPINTEROP_DIR=$CPPINTEROP_BUILD_DIR -DLLVM_REQUIRED_VERSION=$LLVM_REQUIRED_VERSION -DLLVM_USE_LINKER=gold .. && \
294+
cmake -DCMAKE_BUILD_TYPE=Debug -DLLVM_CMAKE_DIR=$PATH_TO_LLVM_BUILD -DCMAKE_PREFIX_PATH=$KERNEL_PYTHON_PREFIX -DCMAKE_INSTALL_PREFIX=$KERNEL_PYTHON_PREFIX -DCMAKE_INSTALL_LIBDIR=lib -DLLVM_CONFIG_EXTRA_PATH_HINTS=${PATH_TO_LLVM_BUILD}/lib -DCPPINTEROP_DIR=$CPPINTEROP_BUILD_DIR -DLLVM_USE_LINKER=gold .. && \
298295
make install -j$(nproc --all) && \
299296
cd .. && \
300297
#

0 commit comments

Comments
 (0)