From 51d257ec70bfcf25768d7751602c863194bd956f Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 19:11:18 -0600 Subject: [PATCH] [AUTO] Increment version to 1.3.15-SNAPSHOT (#1350) * Increment version to 1.3.15-SNAPSHOT Signed-off-by: opensearch-ci-bot * Fix Failing Windows CI Signed-off-by: Naveen Tatikonda * Remove JDK 8 from CI Signed-off-by: Naveen Tatikonda --------- Signed-off-by: opensearch-ci-bot Signed-off-by: Naveen Tatikonda Co-authored-by: opensearch-ci-bot Co-authored-by: Naveen Tatikonda --- .github/workflows/CI.yml | 5 +++-- build.gradle | 4 ++-- jni/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 766308521..15e86c3bd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -15,7 +15,7 @@ jobs: Build-k-NN: strategy: matrix: - java: [8, 11, 14] + java: [ 11, 14 ] name: Build and Test k-NN Plugin runs-on: ubuntu-latest @@ -50,7 +50,7 @@ jobs: Build-k-NN-Windows: strategy: matrix: - java: [ 8, 11, 14 ] + java: [ 11, 14 ] name: Build and Test k-NN Plugin on Windows runs-on: windows-latest @@ -73,6 +73,7 @@ jobs: - name: Add MinGW to PATH run: | echo "C:/Users/runneradmin/scoop/apps/mingw/current/bin" >> $env:GITHUB_PATH + Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1" refreshenv - name: Download OpenBLAS diff --git a/build.gradle b/build.gradle index b0a34d852..79b4521f0 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ import org.apache.tools.ant.taskdefs.condition.Os buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.3.14-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.3.15-SNAPSHOT") knn_bwc_version = System.getProperty("bwc.version", "1.2.0.0-SNAPSHOT") opensearch_bwc_version = "${knn_bwc_version}" - ".0-SNAPSHOT" opensearch_group = "org.opensearch" @@ -453,7 +453,7 @@ afterEvaluate { requires('opensearch', versions.opensearch, EQUAL) //TODO: Use default knn lib version for now, fix will be compare with version that is used in build step. - requires("opensearch-knnlib", "1.3.14.0", EQUAL) + requires("opensearch-knnlib", "1.3.15.0", EQUAL) packager = 'Amazon' vendor = 'Amazon' os = 'LINUX' diff --git a/jni/CMakeLists.txt b/jni/CMakeLists.txt index 90983abee..03c32546b 100644 --- a/jni/CMakeLists.txt +++ b/jni/CMakeLists.txt @@ -48,7 +48,7 @@ else() endif() if(NOT KNN_PLUGIN_VERSION) - set(KNN_PLUGIN_VERSION "1.3.14.0") + set(KNN_PLUGIN_VERSION "1.3.15.0") endif() # Set architecture specific variables