Skip to content

Commit e25820d

Browse files
committed
add windows 20222 tests back
1 parent 2a85825 commit e25820d

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

.github/workflows/cmake-build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
apt-get install -y --no-install-recommends ssh
4848
- name: Install and configure conan
4949
run: |
50-
pip install --upgrade conan==2.0.2
50+
pip install --upgrade conan
5151
CONAN_ARGS="--profile .github/workflows/conan/profiles/${{ matrix.profile }} \
5252
-o with_boost=${H5CPP_WITH_BOOST} \
5353
-o with_mpi=${H5CPP_WITH_MPI} \
@@ -104,6 +104,7 @@ jobs:
104104
"stdfs"
105105
]
106106
runs-on: windows-2019
107+
if: false
107108
steps:
108109
- uses: actions/checkout@v2
109110
- name: Add MSVC to PATH
@@ -116,7 +117,7 @@ jobs:
116117
- name: Install and configure conan
117118
run: |
118119
python -m pip install --upgrade pip
119-
pip install --upgrade conan==2.0.2
120+
pip install --upgrade conan
120121
CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2019 \
121122
-o with_boost=${H5CPP_WITH_BOOST} \
122123
-o shared=${H5CPP_SHARED} \
@@ -187,7 +188,7 @@ jobs:
187188
- name: Install and configure conan
188189
run: |
189190
python -m pip install --upgrade pip
190-
pip install --upgrade conan==2.0.2
191+
pip install --upgrade conan
191192
CONAN_ARGS="--profile .github/workflows/conan/profiles/vs2022 \
192193
-o with_boost=${H5CPP_WITH_BOOST} \
193194
-o shared=${H5CPP_SHARED} \

.github/workflows/conan/profiles/vs2022

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
arch=x86_64
33
build_type=Release
44
compiler=msvc
5-
compiler.version=193
5+
compiler.version=194
66
compiler.runtime=dynamic
77
os=Windows
88

99
[conf]
10-
tools.env.virtualenv:powershell=True
10+
tools.env.virtualenv:powershell=pwsh

conanfile.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ class H5CppConan(ConanFile):
2626

2727
def build_requirements(self):
2828
self.build_requires("catch2/3.3.2")
29-
self.build_requires("ninja/1.10.2")
30-
self.build_requires("zlib/1.2.13")
29+
self.build_requires("ninja/1.12.1")
30+
self.build_requires("zlib/1.3.1")
31+
if self.settings.os == "Windows":
32+
self.tool_requires("b2/5.2.1")
3133

3234
def config_options(self):
3335
if self.settings.os == "Windows":
@@ -38,19 +40,19 @@ def configure(self):
3840
self.options["hdf5"].parallel = True
3941

4042
def requirements(self):
41-
self.requires("hdf5/1.14.0")
43+
self.requires("hdf5/1.14.5")
4244
self.requires("catch2/3.3.2")
43-
self.requires("zlib/1.2.13")
45+
self.requires("zlib/1.3.1")
4446
self.requires("szip/2.1.1")
4547
self.requires("bzip2/1.0.8")
4648

4749
if self.options.get_safe("with_boost", False):
4850
if self.settings.os == "Windows":
49-
self.requires("boost/1.81.0")
51+
self.requires("boost/1.86.0")
5052
elif self.settings.os == "Macos":
51-
self.requires("boost/1.81.0")
53+
self.requires("boost/1.86.0")
5254
else:
53-
self.requires("boost/1.81.0")
55+
self.requires("boost/1.86.0")
5456
if self.options.get_safe("with_mpi", False):
5557
self.requires("openmpi/4.1.0")
5658

0 commit comments

Comments
 (0)