Skip to content

Commit 9077ba6

Browse files
Merge pull request HDFGroup#4708 from HDFGroup/develop
Update branch with latest from develop
2 parents 329207a + d875f74 commit 9077ba6

File tree

162 files changed

+9142
-4154
lines changed

Some content is hidden

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

162 files changed

+9142
-4154
lines changed

.clang-format

+3
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,16 @@ StatementMacros:
7070
- FUNC_ENTER_API
7171
- FUNC_ENTER_API_NAMECHECK_ONLY
7272
- FUNC_ENTER_NOAPI
73+
- FUNC_ENTER_NOAPI_NAMECHECK_ONLY
7374
- FUNC_ENTER_NOAPI_NOERR
7475
- FUNC_ENTER_NOAPI_NOINIT
7576
- FUNC_ENTER_NOAPI_NOINIT_NOERR
7677
- FUNC_ENTER_PACKAGE
7778
- FUNC_LEAVE_API
7879
- FUNC_LEAVE_API_NAMECHECK_ONLY
7980
- FUNC_LEAVE_NOAPI
81+
- FUNC_LEAVE_NOAPI_NAMECHECK_ONLY
82+
- FUNC_LEAVE_NOAPI_VOID_NAMECHECK_ONLY
8083
- FUNC_LEAVE_NOAPI_NOFS
8184
- H5E_END_TRY
8285
- H5E_PRINTF

.github/workflows/abi-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- uses: actions/checkout@v4.1.7
5050

5151
- name: Get published binary (Linux)
52-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
52+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
5353
with:
5454
name: tgz-ubuntu-2204_gcc-binary
5555
path: ${{ github.workspace }}

.github/workflows/clang-format-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4.1.7
1313
- name: Run clang-format style check for C and Java code
14-
uses: DoozyX/clang-format-lint-action@v0.13
14+
uses: DoozyX/clang-format-lint-action@v0.17
1515
with:
1616
source: '.'
1717
extensions: 'c,h,cpp,hpp,java'

.github/workflows/clang-format-fix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2525
- name: Fix C and Java formatting issues detected by clang-format
26-
uses: DoozyX/clang-format-lint-action@9ea72631b74e61ce337d0839a90e76180e997283 # v0.13
26+
uses: DoozyX/clang-format-lint-action@d3c7f85989e3b6416265a0d12f8b4a8aa8b0c4ff # v0.13
2727
with:
2828
source: '.'
2929
extensions: 'c,h,cpp,hpp,java'

.github/workflows/cmake-bintest.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
# Get files created by cmake-ctest script
3535
- name: Get published binary (Windows)
36-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
36+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
3737
with:
3838
name: zip-vs2022_cl-${{ inputs.build_mode }}-binary
3939
path: ${{ github.workspace }}/hdf5
@@ -107,7 +107,7 @@ jobs:
107107
distribution: 'temurin'
108108

109109
- name: Get published binary (Linux)
110-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
110+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
111111
with:
112112
name: tgz-ubuntu-2204_gcc-${{ inputs.build_mode }}-binary
113113
path: ${{ github.workspace }}
@@ -143,31 +143,31 @@ jobs:
143143
cmake --workflow --preset=ci-StdShar-GNUC --fresh
144144
shell: bash
145145

146-
test_binary_mac:
146+
test_binary_mac_latest:
147147
# MacOS w/ Clang + CMake
148148
#
149149
name: "MacOS Clang Binary Test"
150150
runs-on: macos-latest
151151
steps:
152-
- name: Install Dependencies (MacOS)
152+
- name: Install Dependencies (MacOS_latest)
153153
run: brew install ninja doxygen
154154

155-
- name: Set up JDK 19
155+
- name: Set up JDK 21
156156
uses: actions/setup-java@v4
157157
with:
158-
java-version: '19'
158+
java-version: '21'
159159
distribution: 'temurin'
160160

161-
- name: Get published binary (MacOS)
162-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
161+
- name: Get published binary (MacOS_latest)
162+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
163163
with:
164-
name: tgz-osx-${{ inputs.build_mode }}-binary
165-
path: ${{ github.workspace }}
164+
name: tgz-osx-${{ inputs.build_mode }}-binary
165+
path: ${{ github.workspace }}
166166

167-
- name: Uncompress hdf5 binary (MacOS)
167+
- name: Uncompress hdf5 binary (MacOS_latest)
168168
run: |
169-
cd "${{ github.workspace }}"
170-
tar -zxvf ${{ github.workspace }}/HDF5-*-Darwin.tar.gz --strip-components 1
169+
cd "${{ github.workspace }}"
170+
tar -zxvf ${{ github.workspace }}/HDF5-*-Darwin.tar.gz --strip-components 1
171171
172172
- name: set hdf5lib name
173173
id: set-hdf5lib-name
@@ -177,14 +177,14 @@ jobs:
177177
echo "HDF5_ROOT=$HDF5DIR$FILE_NAME_HDF5" >> $GITHUB_OUTPUT
178178
echo "HDF5_PLUGIN_PATH=$HDF5_ROOT/lib/plugin" >> $GITHUB_OUTPUT
179179
180-
- name: List files for the binaries (MacOS)
180+
- name: List files for the binaries (MacOS_latest)
181181
run: |
182-
ls -l ${{ github.workspace }}/HDF_Group/HDF5
182+
ls -l ${{ github.workspace }}/HDF_Group/HDF5
183183
184-
- name: List files for the space (MacOS)
184+
- name: List files for the space (MacOS_latest)
185185
run: |
186-
ls ${{ github.workspace }}
187-
ls ${{ runner.workspace }}
186+
ls ${{ github.workspace }}
187+
ls ${{ runner.workspace }}
188188
189189
# symlinks the compiler executables to a common location
190190
- name: Setup GNU Fortran
@@ -194,7 +194,7 @@ jobs:
194194
compiler: gcc
195195
version: 12
196196

197-
- name: Run ctest (MacOS)
197+
- name: Run ctest (MacOS_latest)
198198
id: run-ctest
199199
env:
200200
HDF5_ROOT: ${{ steps.set-hdf5lib-name.outputs.HDF5_ROOT }}

0 commit comments

Comments
 (0)