Remove Julia CI source patch (HDFGroup#5030)

The H5Oexists issue has been fixed upstream
brtnfld · Oct 31, 2024 · 91a128d · 91a128d
1 parent 3b97f2a
commit 91a128d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 56 deletions.
diff --git 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
@@ -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"
diff --git a/.github/workflows/julia-auto.yml b/.github/workflows/julia-auto.yml
@@ -19,14 +19,6 @@ jobs:
       - name: Get HDF5 source
         uses: actions/[email protected]
 
-        # 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
@@ -19,14 +19,6 @@ jobs:
       - name: Get HDF5 source
         uses: actions/[email protected]
 
-        # 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