diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index e2dcacf9aa4..6bf5a8813cf 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -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" diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cd941e6a7a1..dd863c58517 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -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" \ No newline at end of file + build_mode: "Release" diff --git a/.github/workflows/julia-auto.yml b/.github/workflows/julia-auto.yml index f254335ad96..f31063e1665 100644 --- a/.github/workflows/julia-auto.yml +++ b/.github/workflows/julia-auto.yml @@ -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 diff --git a/.github/workflows/julia-cmake.yml b/.github/workflows/julia-cmake.yml index 02407ce5c85..1d7791b310d 100644 --- a/.github/workflows/julia-cmake.yml +++ b/.github/workflows/julia-cmake.yml @@ -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 diff --git a/.github/workflows/julia_ci.patch b/.github/workflows/julia_ci.patch deleted file mode 100644 index 959a4ec4510..00000000000 --- a/.github/workflows/julia_ci.patch +++ /dev/null @@ -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