diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5181ab53..642946fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,14 +3,10 @@ name: Test and Build Workflow on: pull_request: branches: - - main - - opendistro-* - - plugin-dev + - "*" push: branches: - - main - - opendistro-* - - plugin-dev + - "*" jobs: build: @@ -28,11 +24,11 @@ jobs: - name: Checkout Branch uses: actions/checkout@v2 - name: Build with Gradle - run: ./gradlew build -Dopensearch.version=1.2.1-SNAPSHOT + run: ./gradlew build -Dopensearch.version=1.2.2-SNAPSHOT - name: Pull and Run Docker for security tests run: | - version=1.1.0-SNAPSHOT - plugin_version=1.1.0.0-SNAPSHOT + version=1.2.2-SNAPSHOT + plugin_version=1.2.2.0-SNAPSHOT pwd=`pwd` echo $pwd cd .. diff --git a/.github/workflows/multi-node-test-workflow.yml b/.github/workflows/multi-node-test-workflow.yml index 5be0d037..37253051 100644 --- a/.github/workflows/multi-node-test-workflow.yml +++ b/.github/workflows/multi-node-test-workflow.yml @@ -6,10 +6,10 @@ env: on: pull_request: branches: - - main + - "*" push: branches: - - main + - "*" jobs: build: @@ -27,7 +27,7 @@ jobs: - name: Checkout Branch uses: actions/checkout@v2 - name: Run integration tests with multi node config - run: ./gradlew integTest -PnumNodes=5 -Dopensearch.version=1.2.1-SNAPSHOT + run: ./gradlew integTest -PnumNodes=5 -Dopensearch.version=1.2.2-SNAPSHOT - name: Upload failed logs uses: actions/upload-artifact@v2 if: failure() diff --git a/build.gradle b/build.gradle index 46118c81..16d51cc6 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { distribution = 'oss-zip' opensearch_group = "org.opensearch" isSnapshot = "true" == System.getProperty("build.snapshot", "true") - opensearch_version = System.getProperty("opensearch.version", "1.2.1-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.2-SNAPSHOT") // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2') common_utils_version = System.getProperty("common_utils.version", opensearch_build)