Skip to content

Commit 857c684

Browse files
Remove macos-13 from workflows as it will be deprecated by 2025/11/14
Signed-off-by: Peter Zhu <[email protected]>
1 parent a953860 commit 857c684

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

.github/workflows/assemble.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,22 @@ jobs:
88
strategy:
99
matrix:
1010
java: [ 21, 23 ]
11-
os: [ubuntu-latest, windows-latest, macos-13, ubuntu-24.04-arm]
11+
os: [ubuntu-latest, windows-latest, ubuntu-24.04-arm]
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Set up JDK ${{ matrix.java }}
1515
uses: actions/setup-java@v4
1616
with:
1717
java-version: ${{ matrix.java }}
1818
distribution: temurin
19-
- name: Setup docker (missing on MacOS)
20-
id: setup_docker
21-
if: runner.os == 'macos'
22-
continue-on-error: true
23-
run: |
24-
brew install docker colima coreutils
25-
gtimeout 15m colima start
26-
shell: bash
27-
- name: Run Gradle (assemble)
28-
if: runner.os == 'macos' && steps.setup_docker.outcome != 'success'
29-
run: |
30-
# Report success even if previous step failed (Docker on MacOS runner is very unstable)
31-
exit 0;
19+
# GitHub Actions still not supporting arm64 dind yet
20+
# https://github.com/douglascamata/setup-docker-macos-action?tab=readme-ov-file#arm64-processors-m-series-used-on-macos-14-images-and-beyond-are-unsupported
21+
# And they are deprecating the free x64 macos-13 runner by 2025/11/14
22+
# https://github.blog/changelog/2025-07-11-upcoming-changes-to-macos-hosted-runners-macos-latest-migration-and-xcode-support-policy-updates/
23+
# All new macos-* are arm64 runner by default and x64 runner requires a subscription to `large` runner
24+
# https://github.com/actions/runner-images?tab=readme-ov-file#available-images
25+
# Only use non-arm64 agent in this workflow
3226
- name: Run Gradle (assemble)
3327
shell: bash
34-
if: runner.os != 'macos'
3528
run: |
3629
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE
37-
- name: Run Gradle (assemble)
38-
if: runner.os == 'macos' && steps.setup_docker.outcome == 'success'
39-
run: |
40-
./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE

.github/workflows/precommit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
java: [ 21, 23 ]
11-
os: [ubuntu-latest, windows-latest, macos-latest, macos-13, ubuntu-24.04-arm]
11+
os: [ubuntu-latest, windows-latest, macos-latest, ubuntu-24.04-arm]
1212
include:
1313
- java: 21
1414
os: 'windows-2025'

0 commit comments

Comments
 (0)