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.

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

Sync develop changes March 25 - March 28 to hdf5_1_14 #4284

Merged
merged 36 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
c3d25af
Take user block into account when returning chunk addresses (#4236)
derobins Mar 26, 2024
3e4d488
Fix a minor warning in h5test.c (#4242)
jhendersonHDF Mar 26, 2024
9b1b2ff
Turn on -Werror for Java in GitHub -Werror workflows (#4243)
jhendersonHDF Mar 26, 2024
90685d7
Update Windows CI to not install ninja (#4230)
jhendersonHDF Mar 26, 2024
d9ce39a
Rework Fortran macros to use the proper code. (#4240)
byrnHDF Mar 26, 2024
281e323
Correct reference copy for 16 API (#4244)
byrnHDF Mar 26, 2024
d0170a3
Determine MPI LOGICAL during build, used in tests. (#4246)
brtnfld Mar 26, 2024
35f3e77
Skip userblock test in chunk_info.c for multi-file VFDs (#4249)
jhendersonHDF Mar 26, 2024
afc51c3
Match generators with real cmake -G output on Windows (#4252)
hyoklee Mar 26, 2024
203b13e
Add Julia GitHub Actions. (#4123)
hyoklee Mar 27, 2024
e454b3b
Re-revert to using autoreconf in autogen.sh (#4253)
derobins Mar 27, 2024
0a94294
Rewrite H5T__path_find_real for clarity (#4225)
jhendersonHDF Mar 27, 2024
855f475
Add tgz extensions on names (#4255)
byrnHDF Mar 27, 2024
945e731
Remove an error check regarding large cache objects (#4254)
derobins Mar 27, 2024
95ae39e
File format security issues (#4234)
derobins Mar 27, 2024
4c45dc4
Add job timeout to cygwin workflow (#4260)
byrnHDF Mar 27, 2024
704ca7e
Replace user-define with user-defined (#4261)
hyoklee Mar 27, 2024
5ccc82b
Improve the CMake clang -fsanitize=memory flags (#4267)
derobins Mar 28, 2024
f1477eb
Add documentation (H5M) (#4259)
bmribler Mar 28, 2024
8066824
Add documentation (H5P) (#4262)
bmribler Mar 28, 2024
078b875
MPI type correction (#4268)
brtnfld Mar 28, 2024
4c5897d
Clean up test/cmpd_dtransform.c (#4270)
derobins Mar 28, 2024
605f853
Fix uninitialized memory issues in packet table (#4271)
derobins Mar 28, 2024
5b18aca
replace deprecated CMAKE_COMPILER_IS_GNU** (#4272)
byrnHDF Mar 28, 2024
971c237
Prevent stack overflows in H5E__push_stack (#4264)
jhendersonHDF Mar 28, 2024
c9b2097
Minor fixes after merge of file format security fixes (#4263)
jhendersonHDF Mar 28, 2024
e96e666
CHECK --> CHECK_PTR in tmisc.c (#4274)
derobins Mar 28, 2024
16f7ecd
Add release note for CVE-2017-17507 (#4275)
derobins Mar 28, 2024
468e8db
Update Cygwin installation guide (#4265)
hyoklee Mar 28, 2024
95c29c1
Addresses configuration fortran testing flags (#4276)
brtnfld Mar 28, 2024
9e24749
Merge julia workflows into standard ci format (#4273)
byrnHDF Mar 28, 2024
3fa26d8
Fix range check in H5_addr_overlap (#4278)
jhendersonHDF Mar 29, 2024
d557859
Fix potential buffer read overflows in H5PB_read (#4279)
jhendersonHDF Mar 29, 2024
ec1e520
Remove CRLF from NEWSLETTER.txt. (#4282)
lrknox Mar 29, 2024
271acf8
Version updates for 1.14 files.
lrknox Mar 29, 2024
3225b59
Apply suggestions from code review
lrknox Mar 29, 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
6 changes: 6 additions & 0 deletions .github/workflows/autotools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,10 @@ jobs:
with:
build_mode: "production"

call-release-cmake-julia:
name: "Autotools Julia Workflows"
uses: ./.github/workflows/julia-auto.yml
with:
build_mode: "production"


6 changes: 6 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,10 @@ jobs:
uses: ./.github/workflows/cygwin-cmake.yml
with:
build_mode: "Release"

call-release-cmake-julia:
name: "CMake Julia Workflows"
uses: ./.github/workflows/julia-cmake.yml
with:
build_mode: "Release"

1 change: 1 addition & 0 deletions .github/workflows/cygwin-auto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
cygwin_build_and_test:
name: "cygwin ${{ inputs.build_mode }}"
runs-on: windows-latest
timeout-minutes: 30
steps:
- name: Set git to use LF
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/cygwin-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
cygwin_build_and_test:
name: "cygwin-${{ inputs.build_mode }}"
runs-on: windows-latest
timeout-minutes: 30
steps:
- name: Set git to use LF
run: |
Expand Down
79 changes: 79 additions & 0 deletions .github/workflows/julia-auto.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: hdf5 1.14 autotools julia

on:
workflow_call:
inputs:
build_mode:
description: "release vs. debug build"
required: true
type: string

permissions:
contents: read

jobs:
julia_build_and_test:
name: "julia ${{ inputs.build_mode }}"
runs-on: ubuntu-latest
steps:
- name: Get Sources
uses: actions/checkout@v4.1.1

- name: Install Dependencies
shell: bash
run: |
sudo apt-get update
sudo apt-get install autoconf automake libtool libtool-bin libaec-dev
sudo apt-get install doxygen graphviz
sudo apt install -y zlib1g-dev libcurl4-openssl-dev libjpeg-dev wget curl bzip2
sudo apt install -y m4 flex bison cmake libzip-dev openssl build-essential

- name: Autotools Configure
shell: bash
run: |
sh ./autogen.sh
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
$GITHUB_WORKSPACE/configure \
--enable-build-mode=${{ inputs.build_mode }} \
--disable-fortran \
--enable-shared \
--disable-parallel \
--prefix=/tmp

- name: Autotools Build
shell: bash
run: |
make -j3
working-directory: ${{ runner.workspace }}/build

- name: Install HDF5
shell: bash
run: |
make install
working-directory: ${{ runner.workspace }}/build

- name: Install julia
uses: julia-actions/setup-julia@latest
with:
version: '1.6'
arch: 'x64'

- name: Get julia hdf5 source
uses: actions/checkout@v4.1.1
with:
repository: JuliaIO/HDF5.jl
path: .

- name: Generate LocalPreferences
run: |
echo '[HDF5]' >> LocalPreferences.toml
echo 'libhdf5 = "/tmp/lib/libhdf5.so"' >> LocalPreferences.toml
echo 'libhdf5_hl = "/tmp/lib/libhdf5_hl.so"' >> LocalPreferences.toml

- uses: julia-actions/julia-buildpkg@latest

- name: Julia Run Tests
uses: julia-actions/julia-runtest@latest
env:
JULIA_DEBUG: Main
82 changes: 82 additions & 0 deletions .github/workflows/julia-cmake.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: hdf5 1.14 CMake julia

on:
workflow_call:
inputs:
build_mode:
description: "release vs. debug build"
required: true
type: string

permissions:
contents: read

jobs:
julia_build_and_test:
name: "julia ${{ inputs.build_mode }}"
runs-on: ubuntu-latest
steps:
- name: Get Sources
uses: actions/checkout@v4.1.1

- name: Install Dependencies
shell: bash
run: |
sudo apt update
sudo apt-get install ninja-build doxygen graphviz
sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
sudo apt install -y libaec-dev zlib1g-dev wget curl bzip2 flex bison cmake libzip-dev openssl build-essential

- name: CMake Configure
shell: bash
run: |
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
cmake -C $GITHUB_WORKSPACE/config/cmake/cacheinit.cmake -G Ninja \
-DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
-DHDF5_ENABLE_PARALLEL:BOOL=OFF \
-DHDF5_BUILD_CPP_LIB:BOOL=OFF \
-DLIBAEC_USE_LOCALCONTENT=OFF \
-DZLIB_USE_LOCALCONTENT=OFF \
-DHDF5_BUILD_FORTRAN:BOOL=OFF \
-DHDF5_BUILD_JAVA:BOOL=OFF \
-DCMAKE_INSTALL_PREFIX=/tmp \
$GITHUB_WORKSPACE

- name: CMake Build
shell: bash
run: |
cmake --build . --parallel 3 --config ${{ inputs.build_mode }}
working-directory: ${{ runner.workspace }}/build

- name: Install HDF5
shell: bash
run: |
cmake --install .
working-directory: ${{ runner.workspace }}/build

- name: Install julia
uses: julia-actions/setup-julia@latest
with:
version: '1.6'
arch: 'x64'

- name: Get julia hdf5 source
uses: actions/checkout@v4.1.1
with:
repository: JuliaIO/HDF5.jl
path: .

- name: Generate LocalPreferences
run: |
echo '[HDF5]' >> LocalPreferences.toml
echo 'libhdf5 = "/tmp/lib/libhdf5.so"' >> LocalPreferences.toml
echo 'libhdf5_hl = "/tmp/lib/libhdf5_hl.so"' >> LocalPreferences.toml

- uses: julia-actions/julia-buildpkg@latest

- name: Julia Run Tests
uses: julia-actions/julia-runtest@latest
env:
JULIA_DEBUG: Main
58 changes: 0 additions & 58 deletions .github/workflows/lin-auto-jl.yml

This file was deleted.

60 changes: 0 additions & 60 deletions .github/workflows/lin-jl.yml

This file was deleted.

8 changes: 6 additions & 2 deletions .github/workflows/main-auto-spc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,10 @@ jobs:
sh ./autogen.sh
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
CFLAGS=-Werror $GITHUB_WORKSPACE/configure \
CFLAGS=-Werror JAVACFLAGS=-Werror JNIFLAGS=-Werror \
$GITHUB_WORKSPACE/configure \
--enable-build-mode=debug \
--enable-warnings-as-errors \
--enable-deprecated-symbols \
--with-default-api-version=v114 \
--enable-shared \
Expand Down Expand Up @@ -478,8 +480,10 @@ jobs:
sh ./autogen.sh
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
CFLAGS=-Werror $GITHUB_WORKSPACE/configure \
CFLAGS=-Werror JAVACFLAGS=-Werror JNIFLAGS=-Werror \
$GITHUB_WORKSPACE/configure \
--enable-build-mode=production \
--enable-warnings-as-errors \
--enable-deprecated-symbols \
--with-default-api-version=v114 \
--enable-shared \
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/main-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@ jobs:

# CMake gets libaec from fetchcontent

- name: Install Dependencies (Windows)
run: choco install ninja
if: matrix.os == 'windows-latest'

- name: Install Dependencies (macOS)
run: brew install ninja
if: matrix.os == 'macos-13'
Expand Down
Loading
Loading