From 9357cde7f079e49e8f0cafdc20d1c285f059010d Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Tue, 5 Oct 2021 15:03:48 -0700 Subject: [PATCH 1/3] Bumps version to 1.2 Signed-off-by: Clay Downs --- .github/workflows/cypress-workflow.yml | 8 ++++---- opensearch_dashboards.json | 4 ++-- package.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 727245837..b9f5ff9b1 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -7,8 +7,8 @@ on: branches: - main env: - OPENSEARCH_DASHBOARDS_VERSION: '1.x' - OPENSEARCH_VERSION: '1.1.0-SNAPSHOT' + OPENSEARCH_DASHBOARDS_VERSION: 'main' + OPENSEARCH_VERSION: '1.2.0-SNAPSHOT' jobs: tests: name: Run Cypress E2E tests @@ -30,7 +30,7 @@ jobs: with: repository: opensearch-project/OpenSearch path: OpenSearch - ref: '1.1' + ref: '1.x' - name: Build OpenSearch working-directory: ./OpenSearch run: ./gradlew publishToMavenLocal @@ -40,7 +40,7 @@ jobs: with: repository: opensearch-project/common-utils path: common-utils - ref: '1.1' + ref: 'main' - name: Build common-utils working-directory: ./common-utils run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 5c27f182f..72afca77c 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "alertingDashboards", - "version": "1.1.0.0", - "opensearchDashboardsVersion": "1.1.0", + "version": "1.2.0.0", + "opensearchDashboardsVersion": "1.2.0", "configPath": ["opensearch_alerting"], "requiredPlugins": [], "server": true, diff --git a/package.json b/package.json index d8e333370..320d5b6d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opensearch-alerting-dashboards", - "version": "1.1.0.0", + "version": "1.2.0.0", "description": "OpenSearch Dashboards Alerting Plugin", "main": "index.js", "license": "Apache-2.0", From 6448c416066ea8ce24d81550b346bcd8e377cd25 Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Tue, 5 Oct 2021 15:06:44 -0700 Subject: [PATCH 2/3] Updates unit tests workflow to use dashboards main Signed-off-by: Clay Downs --- .github/workflows/unit-tests-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml index d89b763e1..6b0b98836 100644 --- a/.github/workflows/unit-tests-workflow.yml +++ b/.github/workflows/unit-tests-workflow.yml @@ -7,7 +7,7 @@ on: branches: - main env: - OPENSEARCH_DASHBOARDS_VERSION: '1.x' + OPENSEARCH_DASHBOARDS_VERSION: 'main' jobs: tests: name: Run unit tests From cb9655d89676d61b1d62146de7636833bc00bdb5 Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Tue, 5 Oct 2021 15:55:54 -0700 Subject: [PATCH 3/3] Changes test workflows to follow Dashboards 1.x Signed-off-by: Clay Downs --- .github/workflows/cypress-workflow.yml | 2 +- .github/workflows/unit-tests-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index b9f5ff9b1..069810948 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -7,7 +7,7 @@ on: branches: - main env: - OPENSEARCH_DASHBOARDS_VERSION: 'main' + OPENSEARCH_DASHBOARDS_VERSION: '1.x' OPENSEARCH_VERSION: '1.2.0-SNAPSHOT' jobs: tests: diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml index 6b0b98836..d89b763e1 100644 --- a/.github/workflows/unit-tests-workflow.yml +++ b/.github/workflows/unit-tests-workflow.yml @@ -7,7 +7,7 @@ on: branches: - main env: - OPENSEARCH_DASHBOARDS_VERSION: 'main' + OPENSEARCH_DASHBOARDS_VERSION: '1.x' jobs: tests: name: Run unit tests