Skip to content

Commit a4678ff

Browse files
authored
Merge branch 'develop' into fix_CVE-2025-2926
2 parents 44424b2 + 957a509 commit a4678ff

File tree

275 files changed

+4404
-2919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+4404
-2919
lines changed

.github/workflows/README.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ There are a few that only get triggered manually.
66
## Scheduled Workflows
77
- daily-schedule.yml executes the daily-build.yml which first checks that there are changes
88
* tarball.yml to create a source.zip and source.tar.gz
9-
* cygwin-cmake.yml to test on cygwin
10-
* cmake-script.yml to test and report to my.cdash
11-
* cmake-par-script.yml to test with released MPI and report to my.cdash
12-
* cmake-par-source.yml to test with MPI default branch and report to my.cdash
13-
* cmake-analysis.yml to test with LEAK and ADDRESS sanitizers and report to my.cdash
14-
* cmake-ctest.yml to create signed binaries with commit hash in the name
9+
* cygwin.yml to test on cygwin
10+
* script.yml to test and report to my.cdash
11+
* par-script.yml to test with released MPI and report to my.cdash
12+
* par-source.yml to test with MPI default branch and report to my.cdash
13+
* analysis.yml to test with LEAK and ADDRESS sanitizers and report to my.cdash
14+
* ctest.yml to create signed binaries with commit hash in the name
1515
* abi-report.yml to compare ABI to the last released binaries
1616
* release-files.yml uploads new binaries to snapshots
1717
* remove-files.yml remove previous binaries
@@ -33,21 +33,21 @@ There are a few that only get triggered manually.
3333
- publish-release.yml publishes release binaries to the support.hdfgroup bucket
3434
- release.yml creates binaries for an official release or snapshot
3535
* tarball.yml to create a source.zip and source.tar.gz
36-
* cmake-ctest.yml to create signed binaries
36+
* ctest.yml to create signed binaries
3737
* abi-report.yml to compare ABI to last released binaries
3838
* release-files.yml uploads new binaries to releases page
3939

4040
## Triggered Workflows
4141
- clang-format-check.yml runs clang-format and reports issues
42-
- cmake.yml
42+
- call-workflows.yml
4343
- codespell.yml checks spelling
4444
- cve.yml executes test_hdf5_cve.sh script
4545
- hdfeos5.yml configures and builds HDF5 then tests HDF-EOS5
4646
- linkchecker.yml verifies the links in generated doxygen files
4747
- netcdf.yml configures and builds HDF5 then tests NetCDF
4848

49-
## Workflows called by cmake.yml
50-
- main-cmake-spc.yml configure, build, and test HDF5 with:
49+
## Workflows called by call-workflows.yml
50+
- main-spc.yml configure, build, and test HDF5 with:
5151
* API default v1_6
5252
* API default v1_8
5353
* API default v1_10
@@ -59,16 +59,16 @@ There are a few that only get triggered manually.
5959
* using no filters
6060
* in debug mode and -Werror compiler option
6161
* in release mode and -Werror compiler option
62-
* with minimum cmake Version 3.18
63-
- main-cmake.yml configure, build, test, and package HDF5 on Ubuntu, macOS, and Windows
64-
- cmake-bintest.yml test binary packages created by main-cmake.yml
65-
- main-cmake-par.yml configure, build, and test HDF5 with openmpi
66-
- main-cmake-par-spc.yml configure, build, and test HDF5 with HDF5_ENABLE_WARNINGS_AS_ERRORS=ON
67-
- intel-cmake.yml configure, build, and test HDF5 with Intel OneAPI on Linux and Windows
68-
- nvhpc-cmake.yml configure, build, and test HDF5 with nvhpc
69-
- aocc-cmake.yml configure, build, and test HDF5 with AOCC and OpenMPI
70-
- testxpr-cmake.yml configure, build, and test HDF5 with HDF_TEST_EXPRESS=0
71-
- julia-cmake.yml configure and build HDF5, then test Julia hdf5 source
72-
- msys2-cmake.yml configure, build, and test HDF5 on mingw32, mingw64, ucrt64, clang64
73-
- i386-cmake.yml configure, build, and test HDF5 on 32-bit Linux
62+
* with minimum CMake Version 3.18
63+
- main.yml configure, build, test, and package HDF5 on Ubuntu, macOS, and Windows
64+
- bintest.yml test binary packages created by main.yml
65+
- main-par.yml configure, build, and test HDF5 with openmpi
66+
- main-par-spc.yml configure, build, and test HDF5 with HDF5_ENABLE_WARNINGS_AS_ERRORS=ON
67+
- intel.yml configure, build, and test HDF5 with Intel OneAPI on Linux and Windows
68+
- nvhpc.yml configure, build, and test HDF5 with nvhpc
69+
- aocc.yml configure, build, and test HDF5 with AOCC and OpenMPI
70+
- testxpr.yml configure, build, and test HDF5 with HDF_TEST_EXPRESS=0
71+
- julia.yml configure and build HDF5, then test Julia hdf5 source
72+
- msys2.yml configure, build, and test HDF5 on mingw32, mingw64, ucrt64, clang64
73+
- i386.yml configure, build, and test HDF5 on 32-bit Linux
7474

.github/workflows/cmake-analysis.yml renamed to .github/workflows/analysis.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: hdf5 dev ctest analysis runs
1+
name: hdf5 dev CTest analysis runs
22

33
# Triggers the workflow on a call from another workflow
44
on:
@@ -29,7 +29,7 @@ jobs:
2929
name: "Ubuntu GCC Coverage"
3030
runs-on: ubuntu-22.04
3131
steps:
32-
- name: Install CMake Dependencies (Linux_coverage)
32+
- name: Install Dependencies (Linux_coverage)
3333
run: |
3434
sudo apt update
3535
sudo apt-get install ninja-build doxygen graphviz curl build-essential
@@ -104,14 +104,14 @@ jobs:
104104
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=OFF")
105105
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NO_PACKAGES:BOOL=ON")
106106
107-
- name: Run ctest (Linux_coverage)
107+
- name: Run CTest (Linux_coverage)
108108
run: |
109109
cd "${{ runner.workspace }}/hdf5"
110110
ctest -S HDF5config.cmake,CTEST_SITE_EXT=${{ github.event.repository.full_name }}_COV,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Debug -VV -O hdf5.log
111111
shell: bash
112112
continue-on-error: true
113113

114-
# Save log files created by ctest script
114+
# Save log files created by CTest script
115115
- name: Save log (Linux_coverage)
116116
uses: actions/upload-artifact@v4
117117
with:
@@ -125,7 +125,7 @@ jobs:
125125
name: "Ubuntu Clang LeakSanitizer"
126126
runs-on: ubuntu-22.04
127127
steps:
128-
- name: Install CMake Dependencies (Linux_Leak)
128+
- name: Install Dependencies (Linux_Leak)
129129
run: |
130130
sudo apt update
131131
sudo apt-get install ninja-build doxygen graphviz curl libtinfo5
@@ -205,14 +205,14 @@ jobs:
205205
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
206206
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DPLUGIN_USE_LOCALCONTENT:BOOL=OFF")
207207
208-
- name: Run ctest (Linux_Leak)
208+
- name: Run CTest (Linux_Leak)
209209
run: |
210210
cd "${{ runner.workspace }}/hdf5"
211211
ctest -S HDF5config.cmake,CTEST_SITE_EXT=${{ github.event.repository.full_name }}-LEAK,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Debug -VV -O hdf5.log
212212
shell: bash
213213
continue-on-error: true
214214

215-
# Save log files created by ctest script
215+
# Save log files created by CTest script
216216
- name: Save log (Linux_Leak)
217217
uses: actions/upload-artifact@v4
218218
with:
@@ -226,7 +226,7 @@ jobs:
226226
name: "Ubuntu Clang AddressSanitizer"
227227
runs-on: ubuntu-22.04
228228
steps:
229-
- name: Install CMake Dependencies (Linux_Address)
229+
- name: Install Dependencies (Linux_Address)
230230
run: |
231231
sudo apt update
232232
sudo apt-get install ninja-build doxygen graphviz curl libtinfo5
@@ -306,14 +306,14 @@ jobs:
306306
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
307307
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DPLUGIN_USE_LOCALCONTENT:BOOL=OFF")
308308
309-
- name: Run ctest (Linux_Address)
309+
- name: Run CTest (Linux_Address)
310310
run: |
311311
cd "${{ runner.workspace }}/hdf5"
312312
ctest -S HDF5config.cmake,CTEST_SITE_EXT=${{ github.event.repository.full_name }}-ADDR,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Debug -VV -O hdf5.log
313313
shell: bash
314314
continue-on-error: true
315315

316-
# Save log files created by ctest script
316+
# Save log files created by CTest script
317317
- name: Save log (Linux_Address)
318318
uses: actions/upload-artifact@v4
319319
with:
@@ -327,7 +327,7 @@ jobs:
327327
name: "Ubuntu Clang UndefinedBehaviorSanitizer"
328328
runs-on: ubuntu-22.04
329329
steps:
330-
- name: Install CMake Dependencies (Linux_UndefinedBehavior)
330+
- name: Install Dependencies (Linux_UndefinedBehavior)
331331
run: |
332332
sudo apt update
333333
sudo apt-get install ninja-build doxygen graphviz curl libtinfo5
@@ -407,14 +407,14 @@ jobs:
407407
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_USE_LOCALCONTENT:BOOL=OFF")
408408
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DPLUGIN_USE_LOCALCONTENT:BOOL=OFF")
409409
410-
- name: Run ctest (Linux_UndefinedBehavior)
410+
- name: Run CTest (Linux_UndefinedBehavior)
411411
run: |
412412
cd "${{ runner.workspace }}/hdf5"
413413
ctest -S HDF5config.cmake,CTEST_SITE_EXT=${{ github.event.repository.full_name }}-UNDEF,LOCAL_SUBMIT=ON,NINJA=TRUE,BUILD_GENERATOR=Unix,CTEST_SOURCE_NAME=${{ steps.set-file-base.outputs.SOURCE_BASE }} -C Debug -VV -O hdf5.log
414414
shell: bash
415415
continue-on-error: true
416416

417-
# Save log files created by ctest script
417+
# Save log files created by CTest script
418418
- name: Save log (Linux_UndefinedBehavior)
419419
uses: actions/upload-artifact@v4
420420
with:

.github/workflows/aocc-cmake.yml renamed to .github/workflows/aocc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: hdf5 dev PAR CMake aocc ompi
1+
name: hdf5 dev PAR aocc ompi
22

33
# Triggers the workflow on a call from another workflow
44
on:
@@ -65,7 +65,7 @@ jobs:
6565
make
6666
make install
6767
68-
- name: CMake Configure
68+
- name: Configure
6969
shell: bash
7070
run: |
7171
export LD_LIBRARY_PATH=/home/runner/work/hdf5/hdf5/aocc-compiler-${{ env.AOCCVERDOT }}/lib:/home/runner/work/hdf5/hdf5/openmpi-${{ env.MPIVERDOT }}-install/lib:/usr/local/lib
@@ -88,19 +88,19 @@ jobs:
8888
$GITHUB_WORKSPACE
8989
#cat src/libhdf5.settings
9090
91-
- name: CMake Build
91+
- name: Build
9292
shell: bash
9393
run: |
9494
cmake --build . --parallel 3 --config ${{ inputs.build_mode }}
9595
working-directory: ${{ runner.workspace }}/build
9696

97-
- name: CMake Run Tests
97+
- name: Run Tests
9898
shell: bash
9999
run: |
100100
ctest . -E MPI_TEST --parallel 2 -C ${{ inputs.build_mode }} -V
101101
working-directory: ${{ runner.workspace }}/build
102102

103-
- name: CMake Run Parallel Tests
103+
- name: Run Parallel Tests
104104
shell: bash
105105
run: |
106106
ctest . -R MPI_TEST -E "_by_chunk|_by_pattern" -C ${{ inputs.build_mode }} -V

0 commit comments

Comments
 (0)