diff --git a/.github/workflows/dashboards-reports-release-workflow.yml b/.github/workflows/dashboards-reports-release-workflow.yml index 602567dd..bceefb9d 100644 --- a/.github/workflows/dashboards-reports-release-workflow.yml +++ b/.github/workflows/dashboards-reports-release-workflow.yml @@ -8,7 +8,7 @@ on: env: PLUGIN_NAME: reportsDashboards ARTIFACT_NAME: reports-dashboards - OPENSEARCH_BRANCH: '1.0' + OPENSEARCH_VERSION: '1.0' OPENSEARCH_PLUGIN_VERSION: 1.0.0.0 jobs: @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v1 with: repository: opensearch-project/Opensearch-Dashboards - ref: ${{ env.OPENSEARCH_BRANCH }} + ref: ${{ env.OPENSEARCH_VERSION }} path: dashboards-reports/OpenSearch-Dashboards - name: Setup Node diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index f052f75d..3edea050 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -5,7 +5,7 @@ on: [pull_request, push] env: PLUGIN_NAME: reportsDashboards ARTIFACT_NAME: reports-dashboards - OPENSEARCH_BRANCH: '1.0' + OPENSEARCH_VERSION: '1.0' OPENSEARCH_PLUGIN_VERSION: 1.0.0.0 jobs: @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v1 with: repository: opensearch-project/Opensearch-Dashboards - ref: ${{ env.OPENSEARCH_BRANCH }} + ref: ${{ env.OPENSEARCH_VERSION }} path: dashboards-reports/OpenSearch-Dashboards - name: Setup Node diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml index a802bc44..564ce506 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -3,8 +3,9 @@ name: Test and Build Reports Scheduler on: [push, pull_request] env: - OPENSEARCH_BRANCH: '1.0' - OPENSEARCH_VERSION: '1.0.0' + OPENSEARCH_VERSION: '1.0' + COMMON_UTILS_VERSION: '1.0' + JOB_SCHEDULER_VERSION: '1.0' jobs: build: @@ -22,7 +23,7 @@ jobs: with: repository: 'opensearch-project/OpenSearch' path: OpenSearch - ref: ${{ env.OPENSEARCH_BRANCH }} + ref: ${{ env.OPENSEARCH_VERSION }} - name: Build OpenSearch working-directory: ./OpenSearch run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false @@ -32,22 +33,22 @@ jobs: uses: actions/checkout@v2 with: repository: 'opensearch-project/common-utils' - ref: ${{ env.OPENSEARCH_BRANCH }} + ref: ${{ env.COMMON_UTILS_VERSION }} path: common-utils - name: Build common-utils working-directory: ./common-utils - run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} + run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0 # dependencies: job-scheduler - name: Checkout job-scheduler uses: actions/checkout@v2 with: repository: 'opensearch-project/job-scheduler' - ref: ${{ env.OPENSEARCH_BRANCH }} + ref: ${{ env.JOB_SCHEDULER_VERSION }} path: job-scheduler - name: Build job-scheduler working-directory: ./job-scheduler - run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0 -Dbuild.snapshot=false # reports-scheduler - name: Checkout Reports Scheduler @@ -56,7 +57,7 @@ jobs: - name: Build with Gradle run: | cd reports-scheduler - ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} + ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0 - name: Upload coverage uses: codecov/codecov-action@v1 diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index b4d6f79f..38da24d9 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -32,6 +32,8 @@ buildscript { opensearch_group = "org.opensearch" opensearch_version = System.getProperty("opensearch.version", "1.0.0") kotlin_version = System.getProperty("kotlin.version", "1.4.0") + common_utils_version = "1.0.0.0" + job_scheduler_version = "1.0.0.0" } repositories { @@ -139,8 +141,8 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" compile "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}" compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9" - compile "${group}:common-utils:${opensearchVersion}" - compileOnly "${group}:opensearch-job-scheduler-spi:${opensearchVersion}" + compile "${group}:common-utils:${common_utils_version}" + compileOnly "${group}:opensearch-job-scheduler-spi:${job_scheduler_version}" compile group: 'com.google.guava', name: 'guava', version: '15.0' compile "org.json:json:20180813" compile group: 'com.github.wnameless', name: 'json-flattener', version: '0.1.0'