diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index e2dcacf9aa4..034e577c135 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -90,21 +90,15 @@ jobs: with: build_mode: "production" - call-release-auto-cygwin: - name: "Autotools Cygwin Workflows" - uses: ./.github/workflows/cygwin-auto.yml - with: - build_mode: "production" - call-release-auto-xpr: 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" diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 0867f5757c3..d0f3a713c5b 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -105,18 +105,12 @@ jobs: with: build_mode: "Release" - call-release-cmake-cygwin: - name: "CMake Cygwin Workflows" - uses: ./.github/workflows/cygwin-cmake.yml - with: - build_mode: "Release" - call-release-cmake-xpr: 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" diff --git a/.github/workflows/julia-auto.yml b/.github/workflows/julia-auto.yml index f21fd659413..55ce9be1eba 100644 --- a/.github/workflows/julia-auto.yml +++ b/.github/workflows/julia-auto.yml @@ -65,6 +65,9 @@ jobs: repository: JuliaIO/HDF5.jl path: . + - name: Patch Julia CI + run: git apply ${{ github.workspace }}/.github/workflows/julia_ci.patch -v + - name: Generate LocalPreferences run: | echo '[HDF5]' >> LocalPreferences.toml diff --git a/.github/workflows/julia-cmake.yml b/.github/workflows/julia-cmake.yml index 113b81bd70c..e9211fcb8c6 100644 --- a/.github/workflows/julia-cmake.yml +++ b/.github/workflows/julia-cmake.yml @@ -68,6 +68,9 @@ jobs: repository: JuliaIO/HDF5.jl path: . + - name: Patch Julia CI + run: git apply ${{ github.workspace }}/.github/workflows/julia_ci.patch -v + - name: Generate LocalPreferences run: | echo '[HDF5]' >> LocalPreferences.toml diff --git a/.github/workflows/julia_ci.patch b/.github/workflows/julia_ci.patch new file mode 100644 index 00000000000..959a4ec4510 --- /dev/null +++ b/.github/workflows/julia_ci.patch @@ -0,0 +1,19 @@ +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