diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 7f7ab85002..4a81330d0b 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -23,11 +23,13 @@ jobs: auto-activate-base: true activate-environment: "" + # yaml-cpp package has conflicting gtest headers and is not needed for this project - name: Conda dependencies shell: bash -l {0} run: | conda install curl eigen conda install -c conda-forge hdf5=1.10.6 + conda remove -y yaml-cpp - name: Environment Variables shell: bash -l {0} diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index b38d55c369..841e973b9e 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -24,9 +24,10 @@ Next version * Introduced logger to better manage console output (#876) **Fixed:** - * Patch to compile with Geant4 10.6 + * Patch to compile with Geant4 10.6 (#803) * Patched cmake-search paths for double-down and MOAB (#878) - * Patch to compile with gcc-13 + * Patch to compile with gcc-13 (#882) + * Tweak conda environment for Windows build to avoid conflicting gtest headers (#888) v3.2.2 ====================