Merge branch 'master' into dependabot/github_actions/dependabot/fetch…

…-metadata-2.1.0
jamesmudd · Apr 28, 2024 · dd7b946 · dd7b946
2 parents d534c2d + 5606e32
commit dd7b946
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,23 +22,34 @@ jobs:
 
             - name: Set up JDK (x64)
               uses: actions/setup-java@v4
-              if: runner.arch != 'ARM64'
+              if: runner.arch != 'ARM64' && runner.os != 'Linux'
               with:
                   java-version: ${{ matrix.java }}
-                  architecture: 'x64'
+                  architecture: ${{ runner.arch }}
                   distribution: 'temurin'
                   cache: 'gradle'
 
             - name: Set up JDK (arm64)
               uses: actions/setup-java@v4
-              if: runner.arch == 'ARM64'
+              if: runner.arch == 'ARM64' && runner.os == 'Linux'
               with:
                   java-version: ${{ matrix.java }}
                   architecture: 'aarch64'
                   distribution: 'temurin'
                   cache: 'gradle'
 
-            - name: Install HDF5
+            - name: Install HDF5 (Linux)
+              if: |
+                  runner.arch != 'ARM64' &&
+                  runner.os == 'Linux'
+              run: >
+                wget -q https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.4.2/hdf5-1.14.4-2-ubuntu-2204_gcc.tar.gz
+                  tar -xzf hdf5-1.14.4-2-ubuntu-2204_gcc.tar.gz
+                  tar -xzf hdf5/HDF5-1.14.4.2-Linux.tar.gz
+                  echo "$GITHUB_WORKSPACE/HDF5-1.14.4.2-Linux/HDF_Group/HDF5/1.14.4.2/bin/" >> $GITHUB_PATH
+                  echo $GITHUB_PATH
+
+            - name: Install HDF5 (Mac)
               if: |
                   runner.arch != 'ARM64' &&
                   runner.os == 'Linux'