From 0e543fe9ca8093a103158628af9e2a9873eec56d Mon Sep 17 00:00:00 2001 From: James Mudd Date: Fri, 17 Jan 2025 08:54:58 +0000 Subject: [PATCH 1/2] Add ARM64 GH runners --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32d68828..d7a338da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', ['self-hosted', 'ARM64'] ] + os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', 'ubuntu-24.04-arm', ['self-hosted', 'ARM64'] ] java: [ '8', '11', '17', '21' ] steps: From dfbdbf558350dc2f55d456272a51d0aa62476bf4 Mon Sep 17 00:00:00 2001 From: James Mudd Date: Fri, 17 Jan 2025 21:47:23 +0000 Subject: [PATCH 2/2] Cleanup JDK setup --- .github/workflows/ci.yml | 15 ++------------- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7a338da..d3e604d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,27 +14,16 @@ jobs: strategy: fail-fast: false matrix: - os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', 'ubuntu-24.04-arm', ['self-hosted', 'ARM64'] ] + os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', 'ubuntu-24.04-arm'] java: [ '8', '11', '17', '21' ] steps: - uses: actions/checkout@v4 - - name: Set up JDK (x64) + - name: Set up JDK uses: actions/setup-java@v4 - if: runner.arch != 'ARM64' && runner.os != 'Linux' with: java-version: ${{ matrix.java }} - architecture: ${{ runner.arch }} - distribution: 'temurin' - cache: 'gradle' - - - name: Set up JDK (arm64) - uses: actions/setup-java@v4 - if: runner.arch == 'ARM64' && runner.os == 'Linux' - with: - java-version: ${{ matrix.java }} - architecture: 'aarch64' distribution: 'zulu' cache: 'gradle' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 701f254c..1358c3b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', ['self-hosted', 'ARM64'] ] + os: [ 'macos-latest', 'ubuntu-latest', 'windows-latest', 'ubuntu-24.04-arm'] java: [ '8', '11', '17', '21' ] steps: