From 572db35988d02c767d776af2e4a923684ce5acf0 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 26 Apr 2024 14:42:23 -0400 Subject: [PATCH 1/6] Switch to macos-13 for precommit and assemble due to macos-latest is now arm64 Signed-off-by: Peter Zhu --- .github/workflows/assemble.yml | 2 +- .github/workflows/precommit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml index 382105364c048..4ca421e22dfeb 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-latest] + os: [ubuntu-latest, windows-latest, macos-13] steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml index 800aacec98516..95ca49ac9cb43 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-latest] + os: [ubuntu-latest, windows-latest, macos-13] steps: - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} From 7d43a681ef39ef92418497ae835fd9a5259d5dea Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 26 Apr 2024 14:47:42 -0400 Subject: [PATCH 2/6] Update changelog Signed-off-by: Peter Zhu --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee2bb839db324..2ce9667773ad6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Ignoring unavailable shards during search request execution with ignore_available parameter ([#13298](https://github.com/opensearch-project/OpenSearch/pull/13298)) - Refactoring globMatch using simpleMatchWithNormalizedStrings from Regex ([#13104](https://github.com/opensearch-project/OpenSearch/pull/13104)) - [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)) +- 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)) ### Deprecated From d0ee65352f69d37ac9bc359992c6b2f7deee5cdd Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 26 Apr 2024 16:46:08 -0400 Subject: [PATCH 3/6] Add action Signed-off-by: Peter Zhu --- .github/workflows/assemble.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml index 4ca421e22dfeb..bb96bae19b902 100644 --- a/.github/workflows/assemble.yml +++ b/.github/workflows/assemble.yml @@ -18,8 +18,9 @@ jobs: distribution: temurin - name: Setup docker (missing on MacOS) if: runner.os == 'macos' + with: douglascamata/setup-docker-macos-action@main + - name: Test docker run: | - brew install docker colima start sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock - name: Run Gradle (assemble) From 5cf11f82ed15e4371a2f6abf4ce19217b921f3fd Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 26 Apr 2024 16:47:41 -0400 Subject: [PATCH 4/6] Add action Signed-off-by: Peter Zhu --- .github/workflows/assemble.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml index bb96bae19b902..dae4f666dc48f 100644 --- a/.github/workflows/assemble.yml +++ b/.github/workflows/assemble.yml @@ -18,7 +18,7 @@ jobs: distribution: temurin - name: Setup docker (missing on MacOS) if: runner.os == 'macos' - with: douglascamata/setup-docker-macos-action@main + uses: douglascamata/setup-docker-macos-action@main - name: Test docker run: | colima start From 41854a564e8fa863afe2dbfa1384fda8d6dbc2c6 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 26 Apr 2024 16:57:18 -0400 Subject: [PATCH 5/6] more changes Signed-off-by: Peter Zhu --- .github/workflows/assemble.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml index dae4f666dc48f..ef2cd05f21b01 100644 --- a/.github/workflows/assemble.yml +++ b/.github/workflows/assemble.yml @@ -19,7 +19,8 @@ jobs: - name: Setup docker (missing on MacOS) if: runner.os == 'macos' uses: douglascamata/setup-docker-macos-action@main - - name: Test docker + - name: Test docker (missing on MacOS) + if: runner.os == 'macos' run: | colima start sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock From 97390dfbafa6c634392a843254bacff130494977 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Fri, 26 Apr 2024 17:19:29 -0400 Subject: [PATCH 6/6] Remove colima start command as action already start it Signed-off-by: Peter Zhu --- .github/workflows/assemble.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml index ef2cd05f21b01..d18170e9ea6b7 100644 --- a/.github/workflows/assemble.yml +++ b/.github/workflows/assemble.yml @@ -19,11 +19,6 @@ jobs: - name: Setup docker (missing on MacOS) if: runner.os == 'macos' uses: douglascamata/setup-docker-macos-action@main - - name: Test docker (missing on MacOS) - if: runner.os == 'macos' - run: | - colima start - sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock - name: Run Gradle (assemble) run: | ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE