Merge pull request #1068 from julien-tierny/ci

[ci] downgrading clang to version 18 under windows
topology-tool-kit · Sep 24, 2024 · 6617ff5 · 6617ff5
2 parents 12c6f7d + b05b721
commit 6617ff5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -376,7 +376,7 @@ jobs:
  conda install -c conda-forge "qt>=5.12" \
  libboost-devel glew eigen spectralib zfp \
  sqlite scikit-learn graphviz ninja python=3.10 zlib qhull \
- llvm-openmp clangxx
+ llvm-openmp clangxx=18
  # add TTK & ParaView install folders to PATH
  echo "$PV_DIR/bin" >> $GITHUB_PATH
  echo "$TTK_DIR/bin" >> $GITHUB_PATH
@@ -480,7 +480,7 @@ jobs:
  conda install -c conda-forge "qt>=5.12" \
  libboost-devel glew eigen spectralib zfp \
  sqlite scikit-learn graphviz ninja python=3.10 zlib qhull \
- llvm-openmp clangxx
+ llvm-openmp clangxx=18
  # add TTK & ParaView install folders to PATH
  echo "$PV_DIR/bin" >> $GITHUB_PATH
  echo "$TTK_DIR/bin" >> $GITHUB_PATH

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -436,7 +436,7 @@ jobs:
  run: |
  conda install -c conda-forge libboost-devel glew eigen spectralib zfp \
  sqlite scikit-learn graphviz ninja python=3.10 zlib qhull \
- llvm-openmp clangxx
+ llvm-openmp clangxx=18
  # add TTK & ParaView install folders to PATH
  echo "$PV_DIR/bin" >> $GITHUB_PATH
  echo "$TTK_DIR/bin" >> $GITHUB_PATH

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
@@ -66,7 +66,7 @@ COPY pkg/spectra.sh /tmp
 RUN install-helper /tmp/spectra.sh
 
 # install ParaView
-ARG paraview=5.10.1
+ARG paraview=5.13.0
 ENV PARAVIEW_VERSION=${paraview}
 
 COPY pkg/paraview.sh /tmp