Closed SkyToGround closed 2 years ago
Hi @SkyToGround, It looks like libhdf5 in conancenter is finally compiled with zlib 1.2.12 so to fix tests we need remove my workaround (#588) by
diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
index f3000d367..08be5775e 100644
--- a/.github/workflows/cmake-build.yml
+++ b/.github/workflows/cmake-build.yml
@@ -89,9 +89,7 @@ jobs:
strategy:
matrix:
shared: ["shared", "static"]
- boost: [
- # "boost",
- "stdfs"]
+ boost: ["boost", "stdfs"]
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
@@ -141,9 +139,7 @@ jobs:
strategy:
matrix:
shared: ["shared", "static"]
- boost: [
- # "boost",
- "stdfs"]
+ boost: ["boost", "stdfs"]
mpi: ["serial", "mpi"]
runs-on: macos-10.15
steps:
diff --git a/conanfile.py b/conanfile.py
index b25ebeaba..facd70866 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -26,9 +26,9 @@ class H5CppConan(ConanFile):
def config_options(self):
if self.settings.os == "Windows":
del self.options.with_mpi
- del self.options.with_boost
- if self.settings.os == "Macos":
- del self.options.with_boost
+ # del self.options.with_boost
+ # if self.settings.os == "Macos":
+ # del self.options.with_boost
def configure(self):
if self.options.get_safe("with_mpi", False):
@@ -42,7 +42,7 @@ class H5CppConan(ConanFile):
elif self.settings.os == "Macos":
self.requires("boost/1.77.0")
else:
- self.requires("boost/1.77.0@#35c2c19753eaadacfb846c7198919da7")
+ self.requires("boost/1.77.0")
if self.options.get_safe("with_mpi", False):
self.requires("openmpi/4.1.0")
Hi @SkyToGround, I've just updated your PR to fix the conan github tests.
As the title says.