diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml index 45ce1755c5..cdc0468187 100644 --- a/.github/workflows/cmake-build.yml +++ b/.github/workflows/cmake-build.yml @@ -47,7 +47,7 @@ jobs: apt-get install -y --no-install-recommends ssh - name: Install and configure conan run: | - pip install --upgrade conan==2.0.2 + pip install --upgrade conan CONAN_ARGS="--profile .github/workflows/conan/profiles/${{ matrix.profile }} \ -o with_boost=${H5CPP_WITH_BOOST} \ -o with_mpi=${H5CPP_WITH_MPI} \ @@ -104,6 +104,7 @@ jobs: "stdfs" ] runs-on: windows-2019 + if: false steps: - uses: actions/checkout@v2 - name: Add MSVC to PATH @@ -116,7 +117,7 @@ jobs: - name: Install and configure conan run: | python -m pip install --upgrade pip - pip install --upgrade conan==2.0.2 + pip install --upgrade conan CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2019 \ -o with_boost=${H5CPP_WITH_BOOST} \ -o shared=${H5CPP_SHARED} \ @@ -187,7 +188,7 @@ jobs: - name: Install and configure conan run: | python -m pip install --upgrade pip - pip install --upgrade conan==2.0.2 + pip install --upgrade conan CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2022 \ -o with_boost=${H5CPP_WITH_BOOST} \ -o shared=${H5CPP_SHARED} \ diff --git a/.github/workflows/conan/profiles/vs2022 b/.github/workflows/conan/profiles/vs2022 index 7ad705cf0b..2fb8cf4f71 100644 --- a/.github/workflows/conan/profiles/vs2022 +++ b/.github/workflows/conan/profiles/vs2022 @@ -2,9 +2,9 @@ arch=x86_64 build_type=Release compiler=msvc -compiler.version=193 +compiler.version=194 compiler.runtime=dynamic os=Windows [conf] -tools.env.virtualenv:powershell=True \ No newline at end of file +tools.env.virtualenv:powershell=pwsh diff --git a/conanfile.py b/conanfile.py index 5669fd1f1a..1a807cdf34 100644 --- a/conanfile.py +++ b/conanfile.py @@ -26,8 +26,10 @@ class H5CppConan(ConanFile): def build_requirements(self): self.build_requires("catch2/3.3.2") - self.build_requires("ninja/1.10.2") - self.build_requires("zlib/1.2.13") + self.build_requires("ninja/1.12.1") + self.build_requires("zlib/1.3.1") + if self.settings.os == "Windows": + self.tool_requires("b2/5.2.1") def config_options(self): if self.settings.os == "Windows": @@ -38,19 +40,19 @@ def configure(self): self.options["hdf5"].parallel = True def requirements(self): - self.requires("hdf5/1.14.0") + self.requires("hdf5/1.14.5") self.requires("catch2/3.3.2") - self.requires("zlib/1.2.13") + self.requires("zlib/1.3.1") self.requires("szip/2.1.1") self.requires("bzip2/1.0.8") if self.options.get_safe("with_boost", False): if self.settings.os == "Windows": - self.requires("boost/1.81.0") + self.requires("boost/1.86.0") elif self.settings.os == "Macos": - self.requires("boost/1.81.0") + self.requires("boost/1.86.0") else: - self.requires("boost/1.81.0") + self.requires("boost/1.86.0") if self.options.get_safe("with_mpi", False): self.requires("openmpi/4.1.0")