From 9e0f0e5b3a1bd421925931bce7baf7bc113f6cd4 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Fri, 2 Aug 2024 10:48:35 -0400 Subject: [PATCH] Add MacOS aarch64 to assemble / precommit since we rolled out the support for such distribution Signed-off-by: Andriy Redko --- .github/workflows/assemble.yml | 8 ++++++-- .github/workflows/precommit.yml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml index 51ae075ffa2c9..6a8f5e19e91ff 100644 --- a/.github/workflows/assemble.yml +++ b/.github/workflows/assemble.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: java: [ 11, 17, 21 ] - os: [ubuntu-latest, windows-latest, macos-13] + os: [ubuntu-latest, windows-latest, macos-latest, macos-13] steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} @@ -18,7 +18,7 @@ jobs: distribution: temurin - name: Setup docker (missing on MacOS) id: setup_docker - if: runner.os == 'macos' + if: runner.os == 'macos' && runner.arch != 'arm64' uses: douglascamata/setup-docker-macos-action@main continue-on-error: true with: @@ -37,3 +37,7 @@ jobs: if: runner.os == 'macos' && steps.setup_docker.outcome == 'success' run: | ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE + - name: Run Gradle (assemble) + if: runner.os == 'macos' && runner.arch == 'arm64' + run: | + ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml index 95ca49ac9cb43..793fdae5df4da 100644 --- a/.github/workflows/precommit.yml +++ b/.github/workflows/precommit.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: java: [ 11, 17, 21 ] - os: [ubuntu-latest, windows-latest, macos-13] + os: [ubuntu-latest, windows-latest, macos-latest, macos-13] steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }}