Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove yaml-cpp conda pkg from Windows CI env to avoid gtest conflict #888

Merged
merged 10 commits into from
Jul 25, 2023
Merged

Remove yaml-cpp conda pkg from Windows CI env to avoid gtest conflict #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f7344ef
add PR numbers to changelog
gonuke Jul 22, 2023
9af49dd
temporarily run on pushes to all branches to facilitate testing
gonuke Jul 22, 2023
7e79919
run conda package and stop
gonuke Jul 22, 2023
f7d7943
explore consequences of removing yaml-cpp
gonuke Jul 22, 2023
5b786f7
continue build after removing yaml-cpp
gonuke Jul 22, 2023
9f5a251
add comment to explain conda pkg removal
gonuke Jul 22, 2023
9bcb43e
Changelog entry
gonuke Jul 22, 2023
7df333c
re-add only running workflow on pushes to develop
gonuke Jul 22, 2023
3ca18e0
move comment for action syntax
gonuke Jul 22, 2023
4f6da09
add PR number to changelog
gonuke Jul 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/windows_build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

interesting I wonder how this one is brought in to the environment.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conda install with --no-deps would perhas be another option

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using a standard miniconda environment as the windows image, so it probably is just there from that process

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... so it's only really relevant for CI, this this is a pretty good solution, I think


- name: Environment Variables
shell: bash -l {0}
Expand Down
5 changes: 3 additions & 2 deletions doc/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
====================
Expand Down