From 3999f2810969be98d2e656854225b3a9bf9b6fca Mon Sep 17 00:00:00 2001 From: David Gardner Date: Fri, 8 Sep 2023 12:48:38 -0700 Subject: [PATCH] Revert boost upgrade, and updatge clang to v16 --- ci/conda/environments/clang_env.yml | 16 ++++++++-------- ci/conda/environments/dev_env.yml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/conda/environments/clang_env.yml b/ci/conda/environments/clang_env.yml index 9c8867ae4..50d6cc655 100644 --- a/ci/conda/environments/clang_env.yml +++ b/ci/conda/environments/clang_env.yml @@ -19,11 +19,11 @@ name: mrc channels: - conda-forge dependencies: - - clang=15 - - clang-tools=15 - - clangdev=15 - - clangxx=15 - - libclang=15 - - libclang-cpp=15 - - llvmdev=15 - - include-what-you-use=0.19 + - clang=16 + - clang-tools=16 + - clangdev=16 + - clangxx=16 + - libclang=16 + - libclang-cpp=16 + - llvmdev=16 + - include-what-you-use diff --git a/ci/conda/environments/dev_env.yml b/ci/conda/environments/dev_env.yml index 5af8a91c9..58d83d9a7 100644 --- a/ci/conda/environments/dev_env.yml +++ b/ci/conda/environments/dev_env.yml @@ -25,7 +25,7 @@ dependencies: - autoconf>=2.69 - bash-completion - benchmark=1.6.0 - - boost-cpp=1.82 + - boost-cpp=1.74 - ccache - cmake=3.24 - cuda-toolkit # Version comes from the channel above @@ -46,7 +46,7 @@ dependencies: - isort - jinja2=3.0 - lcov=1.15 - - libhwloc=2.9.2 + - libhwloc=2.5 - libprotobuf=3.21 - librmm=23.06 - libtool