Skip to content

Commit 8ed9823

Browse files
Switch to macos-13 runner for precommit and assemble github actions due to macos-latest is now arm64 (#13412) (#13420)
* Switch to macos-13 for precommit and assemble due to macos-latest is now arm64 * Update changelog * Add action * Add action * more changes * Remove colima start command as action already start it --------- (cherry picked from commit 207bbad) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 4163aa1 commit 8ed9823

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/workflows/assemble.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
matrix:
1010
java: [ 11, 17, 21 ]
11-
os: [ubuntu-latest, windows-latest, macos-latest]
11+
os: [ubuntu-latest, windows-latest, macos-13]
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Set up JDK ${{ matrix.java }}
@@ -18,10 +18,7 @@ jobs:
1818
distribution: temurin
1919
- name: Setup docker (missing on MacOS)
2020
if: runner.os == 'macos'
21-
run: |
22-
brew install docker
23-
colima start
24-
sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
21+
uses: douglascamata/setup-docker-macos-action@main
2522
- name: Run Gradle (assemble)
2623
run: |
2724
./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: [ 11, 17, 21 ]
11-
os: [ubuntu-latest, windows-latest, macos-latest]
11+
os: [ubuntu-latest, windows-latest, macos-13]
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Set up JDK ${{ matrix.java }}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5656
- Ignoring unavailable shards during search request execution with ignore_available parameter ([#13298](https://github.com/opensearch-project/OpenSearch/pull/13298))
5757
- Refactoring globMatch using simpleMatchWithNormalizedStrings from Regex ([#13104](https://github.com/opensearch-project/OpenSearch/pull/13104))
5858
- [BWC and API enforcement] Reconsider the breaking changes check policy to detect breaking changes against released versions ([#13292](https://github.com/opensearch-project/OpenSearch/pull/13292))
59+
- Switch to macos-13 runner for precommit and assemble github actions due to macos-latest is now arm64 ([#13412](https://github.com/opensearch-project/OpenSearch/pull/13412))
5960

6061
### Deprecated
6162

0 commit comments

Comments
 (0)