diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b098d12..1a7cd92f 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: @@ -22,23 +20,30 @@ jobs: java: - 21 - 23 - name: Build and Test - runs-on: ubuntu-latest + os: + - ubuntu-24.04-arm # arm64-preview + - ubuntu-24.04 # x64 + 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 # 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: | @@ -57,17 +62,18 @@ jobs: java: - 21 - 23 - name: Build and Test + name: Build and Test Windows runs-on: windows-latest 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: | 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'