mirrors/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2026-09-25 04:09:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove Julia CI source patch (#5030)

Browse Source 
The H5Oexists issue has been fixed upstream
This commit is contained in:
Dana Robinson
2024-10-29 10:17:49 -07:00
committed by GitHub
parent 192d630f27
commit b7ebf03db5
5 changed files with 11 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/autotools.yml
+5 -5
View File
@@ -100,11 +100,11 @@ jobs:
name: "Autotools TestExpress Workflows"
uses: ./.github/workflows/testxpr-auto.yml
# call-release-auto-julia:
# name: "Autotools Julia Workflows"
# uses: ./.github/workflows/julia-auto.yml
# with:
# build_mode: "production"
call-release-auto-julia:
name: "Autotools Julia Workflows"
uses: ./.github/workflows/julia-auto.yml
with:
build_mode: "production"
# workflow-msys2-autotools:
# name: "CMake msys2 Workflows"
.github/workflows/cmake.yml
+6 -6
View File
@@ -109,14 +109,14 @@ jobs:
name: "CMake TestExpress Workflows"
uses: ./.github/workflows/testxpr-cmake.yml
# call-release-cmake-julia:
# name: "CMake Julia Workflows"
# uses: ./.github/workflows/julia-cmake.yml
# with:
# build_mode: "Release"
call-release-cmake-julia:
name: "CMake Julia Workflows"
uses: ./.github/workflows/julia-cmake.yml
with:
build_mode: "Release"
call-release-cmake-msys2:
name: "CMake Msys2 Workflows"
uses: ./.github/workflows/msys2-cmake.yml
with:
build_mode: "Release"
build_mode: "Release"
.github/workflows/julia-auto.yml
-13
View File
@@ -19,14 +19,6 @@ jobs:
- name: Get HDF5 source
uses: actions/checkout@v4.1.7
# Checking out the Julia HDF5 wrappers will clobber the HDF5 checkout
# NOTE: Remove this when the Julia wrappers have been patched
- name: Save the Julia patch file
shell: bash
run: |
mkdir "${{ runner.workspace }}/julia_patch"
cp .github/workflows/julia_ci.patch "${{ runner.workspace }}/julia_patch"
- name: Install Dependencies
shell: bash
run: |
@@ -73,11 +65,6 @@ jobs:
repository: JuliaIO/HDF5.jl
path: .
# NOTE: Remove this when the Julia wrappers have been patched
- name: Patch Julia CI
run: |
git apply "${{ runner.workspace }}/julia_patch/julia_ci.patch" -v
- name: Generate LocalPreferences
run: |
echo '[HDF5]' >> LocalPreferences.toml
.github/workflows/julia-cmake.yml
-13
View File
@@ -19,14 +19,6 @@ jobs:
- name: Get HDF5 source
uses: actions/checkout@v4.1.7
# Checking out the Julia HDF5 wrappers will clobber the HDF5 checkout
# NOTE: Remove this when the Julia wrappers have been patched
- name: Save the Julia patch file
shell: bash
run: |
mkdir "${{ runner.workspace }}/julia_patch"
cp .github/workflows/julia_ci.patch "${{ runner.workspace }}/julia_patch"
- name: Install Dependencies
shell: bash
run: |
@@ -76,11 +68,6 @@ jobs:
repository: JuliaIO/HDF5.jl
path: .
# NOTE: Remove this when the Julia wrappers have been patched
- name: Patch Julia CI
run: |
git apply "${{ runner.workspace }}/julia_patch/julia_ci.patch" -v
- name: Generate LocalPreferences
run: |
echo '[HDF5]' >> LocalPreferences.toml
.github/workflows/julia_ci.patch
-19
View File
@@ -1,19 +0,0 @@
diff --git a/test/objects.jl b/test/objects.jl
index d68dd749..0541e91a 100644
--- a/test/objects.jl
+++ b/test/objects.jl
@@ -16,7 +16,13 @@ using HDF5.API
h5open(fn, "r") do h5f
@test API.h5o_exists_by_name(h5f, "data")
@test API.h5o_exists_by_name(h5f, "lore")
- @test_throws API.H5Error API.h5o_exists_by_name(h5f, "noonian")
+ @static if HDF5.API.h5_get_libversion() <= v"1.14.5"
+ # Buggy behavior in earlier versions of HDF5 returns FAIL (-1)
+ @test_throws API.H5Error API.h5o_exists_by_name(h5f, "noonian")
+ else
+ # The correct behavior is to return false (0)
+ @test API.h5o_exists_by_name(h5f, "noonian") == 0
+ end
loc_id = API.h5o_open(h5f, "data", API.H5P_DEFAULT)
try