Skip to content

Commit

Permalink
Update HDF5 version in ESS conanfile (#640)
Browse files Browse the repository at this point in the history
* Update HDF5 version in ESS conanfile

* Bump more conan dep versions

* Remove boost option

* Enable boost container

* Force build conan b2 package locally
  • Loading branch information
amues authored Nov 1, 2023
1 parent 6ce35c3 commit 63190ec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Jenkinsfile
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
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

0 comments on commit 63190ec

Please sign in to comment.