From 5606e321d43aeaa402fc621485e31a7d6812ea9c Mon Sep 17 00:00:00 2001 From: James Mudd Date: Sun, 28 Apr 2024 16:46:43 +0100 Subject: [PATCH] Fix Java install on mac arm64 (#568) --- .github/workflows/ci.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d1eeb35..61312010 100644 --- 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'