From acd5098af411ce77e34b22f3e0f89b36f8458bcf Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 27 Jan 2025 20:58:38 +0000 Subject: [PATCH 1/5] Update common-utils shadow plugin repo and bump to 3.0.0.0-alpha1 Signed-off-by: Peter Zhu --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 332ae8d4..dae8d76b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") - buildVersionQualifier = System.getProperty("build.version_qualifier", "") + buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1") kotlin_version = System.getProperty("kotlin.version", "1.9.25") } @@ -58,7 +58,7 @@ apply plugin: 'java' apply plugin: 'jacoco' apply plugin: 'signing' apply plugin: 'maven-publish' -apply plugin: 'com.github.johnrengelman.shadow' +apply plugin: 'com.gradleup.shadow' // apply plugin: 'io.gitlab.arturbosch.detekt' apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'org.jetbrains.kotlin.plugin.allopen' From c5e6f11d4f8ca6b8b07548d79d15e19b6df5d5ef Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 27 Jan 2025 21:07:40 +0000 Subject: [PATCH 2/5] Update workflow to fix glibc issues Signed-off-by: Peter Zhu --- .github/workflows/ci.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b098d12..5da31674 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,8 +6,6 @@ on: pull_request: branches: - "*" -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true jobs: Get-CI-Image-Tag: @@ -23,22 +21,31 @@ jobs: - 21 - 23 name: Build and Test - runs-on: ubuntu-latest + strategy: + matrix: + os: + - ubuntu-24.04-arm # arm64-preview + - ubuntu-24.04 # x64 + runs-on: ${{ matrix.os }} container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution # this image tag is subject to change as more dependencies and updates will arrive over time image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} # need to switch to root so that github actions can install runner binary on container without permission issues. - options: --user root + options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} steps: + - name: Run start commands + run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }} + - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} + distribution: 'temurin' - name: Build and Test run: | @@ -62,12 +69,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} + distribution: 'temurin' - name: Build and Test run: | From 0621648ef569233cfbf11c29d1ebe5709d5b9ec5 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 27 Jan 2025 21:09:40 +0000 Subject: [PATCH 3/5] Update workflow to fix glibc issues Signed-off-by: Peter Zhu --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5da31674..55401cf6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,10 +22,10 @@ jobs: - 23 name: Build and Test strategy: - matrix: - os: - - ubuntu-24.04-arm # arm64-preview - - ubuntu-24.04 # x64 + matrix: + os: + - ubuntu-24.04-arm # arm64-preview + - ubuntu-24.04 # x64 runs-on: ${{ matrix.os }} container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution From 7b223a82cd6a21f5f8e43d79a7e3e7bf622b0c8c Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 27 Jan 2025 21:11:43 +0000 Subject: [PATCH 4/5] Update workflow to fix glibc issues Signed-off-by: Peter Zhu --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55401cf6..45378537 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,12 +20,10 @@ jobs: java: - 21 - 23 - name: Build and Test - strategy: - matrix: os: - ubuntu-24.04-arm # arm64-preview - ubuntu-24.04 # x64 + name: Build and Test runs-on: ${{ matrix.os }} container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution From ab13e22e757bf028b7e80fa9ee9b976c07f777ca Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 27 Jan 2025 21:13:31 +0000 Subject: [PATCH 5/5] Update workflow to fix glibc issues Signed-off-by: Peter Zhu --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45378537..1a7cd92f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: os: - ubuntu-24.04-arm # arm64-preview - ubuntu-24.04 # x64 - name: Build and Test + name: Build and Test Linux runs-on: ${{ matrix.os }} container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution @@ -62,7 +62,7 @@ jobs: java: - 21 - 23 - name: Build and Test + name: Build and Test Windows runs-on: windows-latest steps: