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

Jump to bottom

Update HDF5 version in ESS conanfile #640

Merged
merged 5 commits into from
Nov 1, 2023
Merged

Update HDF5 version in ESS conanfile #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e764859
Update HDF5 version in ESS conanfile
amues Nov 1, 2023
971a4d3
Bump more conan dep versions
amues Nov 1, 2023
c940170
Remove boost option
amues Nov 1, 2023
fef2804
Enable boost container
amues Nov 1, 2023
0d7eb62
Force build conan b2 package locally
amues Nov 1, 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 Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ builders = pipeline_builder.createBuilders { container ->
container.sh """
mkdir build
cd build
# Force build b2 locally due to glibc compatibility issue
conan install --build b2 b2/4.9.6@
cmake --version
cmake ${cmake_options} ../${pipeline_builder.project}
"""
Expand Down
8 changes: 3 additions & 5 deletions conanfile_ess.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[requires]
boost/1.69.0
hdf5/1.12.2
zlib/1.2.11
boost/1.81.0
hdf5/1.14.1
zlib/1.2.13
bzip2/1.0.8
catch2/3.3.2

Expand All @@ -13,9 +13,7 @@ virtualrunenv

[options]
boost:shared=True
boost:without_atomic=True
boost:without_chrono=True
boost:without_container=True
boost:without_context=True
boost:without_contract=True
boost:without_coroutine=True
Expand Down
Loading