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

Make platform specific test presets for windows and macs #3988

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Make platform specific test presets for windows and macs #3988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce00fe3
Make platform specific test presets for windows and macs
byrnHDF Feb 4, 2024
3c61a78
Enable mac tests
byrnHDF Feb 4, 2024
a2a0672
Add platform test workflows to examples
byrnHDF Feb 4, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/cmake-bintest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:
# MacOS w/ Clang + CMake
#
name: "MacOS Clang Binary Test"
if: false
# if: false
runs-on: macos-13
steps:
- name: Install Dependencies (MacOS)
Expand Down Expand Up @@ -214,6 +214,6 @@ jobs:
HDF5_PLUGIN_PATH: ${{ steps.set-hdf5lib-name.outputs.HDF5_PLUGIN_PATH }}
run: |
cd "${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}/share/HDF5Examples"
cmake --workflow --preset=ci-StdShar-Clang --fresh
cmake --workflow --preset=ci-StdShar-OSX-Clang --fresh
shell: bash

8 changes: 4 additions & 4 deletions .github/workflows/cmake-ctest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ jobs:
id: run-ctest
run: |
cd "${{ runner.workspace }}/hdf5/hdfsrc"
cmake --workflow --preset=${{ inputs.preset_name }}-Clang --fresh
cmake --workflow --preset=${{ inputs.preset_name }}-OSX-Clang --fresh
shell: bash

- name: Publish binary (MacOS)
Expand All @@ -231,7 +231,7 @@ jobs:
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/README.md ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Clang/*.tar.gz ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-OSX-Clang/*.tar.gz ${{ runner.workspace }}/build/hdf5
cd "${{ runner.workspace }}/build"
tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-osx12.tar.gz hdf5
shell: bash
Expand Down Expand Up @@ -369,7 +369,7 @@ jobs:
CXX: ${{ steps.setup-fortran.outputs.cxx }}
run: |
cd "${{ runner.workspace }}/hdf5/hdfsrc"
cmake --workflow --preset=${{ inputs.preset_name }}-Intel --fresh
cmake --workflow --preset=${{ inputs.preset_name }}-win-Intel --fresh
shell: pwsh

- name: Publish binary (Windows_intel)
Expand All @@ -380,7 +380,7 @@ jobs:
Copy-Item -Path ${{ runner.workspace }}/hdf5/hdfsrc/COPYING -Destination ${{ runner.workspace }}/build/hdf5/
Copy-Item -Path ${{ runner.workspace }}/hdf5/hdfsrc/COPYING_LBNL_HDF5 -Destination ${{ runner.workspace }}/build/hdf5/
Copy-Item -Path ${{ runner.workspace }}/hdf5/hdfsrc/README.md -Destination ${{ runner.workspace }}/build/hdf5/
Copy-Item -Path ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Intel/* -Destination ${{ runner.workspace }}/build/hdf5/ -Include *.zip
Copy-Item -Path ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-win-Intel/* -Destination ${{ runner.workspace }}/build/hdf5/ -Include *.zip
cd "${{ runner.workspace }}/build"
7z a -tzip ${{ steps.set-file-base.outputs.FILE_BASE }}-win-vs2022_intel.zip hdf5
shell: pwsh
Expand Down
50 changes: 48 additions & 2 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,23 @@
"ci-x64-Release-Clang"
]
},
{
"name": "ci-StdShar-OSX-Clang",
"configurePreset": "ci-StdShar-Clang",
"inherits": [
"ci-x64-Release-Clang"
],
"execution": {
"noTestsAction": "error",
"timeout": 180,
"jobs": 2
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Darwin"
}
},
{
"name": "ci-StdShar-GNUC",
"configurePreset": "ci-StdShar-GNUC",
Expand All @@ -257,7 +274,7 @@
]
},
{
"name": "ci-StdShar-Intel",
"name": "ci-StdShar-win-Intel",
"configurePreset": "ci-StdShar-Intel",
"inherits": [
"ci-x64-Release-Intel"
Expand All @@ -266,7 +283,19 @@
"exclude": {
"name": "H5DUMP-tfloatsattrs"
}
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
}
},
{
"name": "ci-StdShar-Intel",
"configurePreset": "ci-StdShar-Intel",
"inherits": [
"ci-x64-Release-Intel"
]
}
],
"packagePresets": [
Expand Down Expand Up @@ -315,6 +344,15 @@
{"type": "package", "name": "ci-StdShar-Clang"}
]
},
{
"name": "ci-StdShar-OSX-Clang",
"steps": [
{"type": "configure", "name": "ci-StdShar-Clang"},
{"type": "build", "name": "ci-StdShar-Clang"},
{"type": "test", "name": "ci-StdShar-OSX-Clang"},
{"type": "package", "name": "ci-StdShar-Clang"}
]
},
{
"name": "ci-StdShar-GNUC",
"steps": [
Expand All @@ -341,7 +379,15 @@
{"type": "test", "name": "ci-StdShar-Intel"},
{"type": "package", "name": "ci-StdShar-Intel"}
]
},
{
"name": "ci-StdShar-win-Intel",
"steps": [
{"type": "configure", "name": "ci-StdShar-Intel"},
{"type": "build", "name": "ci-StdShar-Intel"},
{"type": "test", "name": "ci-StdShar-win-Intel"},
{"type": "package", "name": "ci-StdShar-Intel"}
]
}
]
}

50 changes: 50 additions & 0 deletions HDF5Examples/CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,47 @@
"ci-x64-Release-Clang"
]
},
{
"name": "ci-StdShar-OSX-Clang",
"configurePreset": "ci-StdShar-Clang",
"inherits": [
"ci-x64-Release-Clang"
],
"execution": {
"noTestsAction": "error",
"timeout": 180,
"jobs": 2
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Darwin"
}
},
{
"name": "ci-StdShar-GNUC",
"configurePreset": "ci-StdShar-GNUC",
"inherits": [
"ci-x64-Release-GNUC"
]
},
{
"name": "ci-StdShar-win-Intel",
"configurePreset": "ci-StdShar-Intel",
"inherits": [
"ci-x64-Release-Intel"
],
"filter": {
"exclude": {
"name": "H5DUMP-tfloatsattrs"
}
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
}
},
{
"name": "ci-StdShar-Intel",
"configurePreset": "ci-StdShar-Intel",
Expand All @@ -160,6 +194,14 @@
{"type": "test", "name": "ci-StdShar-Clang"}
]
},
{
"name": "ci-StdShar-OSX-Clang",
"steps": [
{"type": "configure", "name": "ci-StdShar-Clang"},
{"type": "build", "name": "ci-StdShar-Clang"},
{"type": "test", "name": "ci-StdShar-OSX-Clang"}
]
},
{
"name": "ci-StdShar-GNUC",
"steps": [
Expand All @@ -175,6 +217,14 @@
{"type": "build", "name": "ci-StdShar-Intel"},
{"type": "test", "name": "ci-StdShar-Intel"}
]
},
{
"name": "ci-StdShar-win-Intel",
"steps": [
{"type": "configure", "name": "ci-StdShar-Intel"},
{"type": "build", "name": "ci-StdShar-Intel"},
{"type": "test", "name": "ci-StdShar-win-Intel"}
]
}
]
}
Loading