diff --git a/.github/workflows/cypress-workflow.yml b/.github/workflows/cypress-workflow.yml index 8ddceaf47..5b7361efb 100644 --- a/.github/workflows/cypress-workflow.yml +++ b/.github/workflows/cypress-workflow.yml @@ -8,7 +8,6 @@ on: - "*" env: OPENSEARCH_DASHBOARDS_VERSION: '2.x' - OPENSEARCH_VERSION: '2.7.0-SNAPSHOT' ALERTING_PLUGIN_BRANCH: '2.x' jobs: tests: @@ -24,7 +23,7 @@ jobs: uses: actions/setup-java@v1 with: # TODO: Parse this from alerting plugin - java-version: 14 + java-version: 17 - name: Checkout uses: actions/checkout@v2 with: @@ -34,7 +33,7 @@ jobs: - name: Run Opensearch with plugin run: | cd alerting - ./gradlew run -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} & + ./gradlew run & timeout 300 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9200)" != "200" ]]; do sleep 5; done' - name: Checkout OpenSearch Dashboards uses: actions/checkout@v2 diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json index 3202e268b..4820dab94 100644 --- a/opensearch_dashboards.json +++ b/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "alertingDashboards", - "version": "2.7.0.0", - "opensearchDashboardsVersion": "2.7.0", + "version": "2.8.0.0", + "opensearchDashboardsVersion": "2.8.0", "configPath": ["opensearch_alerting"], "requiredPlugins": [], "server": true, diff --git a/package.json b/package.json index 2cd743c42..947fb9a46 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opensearch-alerting-dashboards", - "version": "2.7.0.0", + "version": "2.8.0.0", "description": "OpenSearch Dashboards Alerting Plugin", "main": "index.js", "license": "Apache-2.0", @@ -32,7 +32,7 @@ "@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards", "cypress": "^6.0.0", "husky": "^3.0.0", - "lint-staged": "^10.0.0", + "lint-staged": "^10.2.0", "@babel/plugin-transform-modules-commonjs": "^7.16.5" }, "dependencies": { diff --git a/public/components/FormControls/FormikFieldPassword/__snapshots__/FormikFieldPassword.test.js.snap b/public/components/FormControls/FormikFieldPassword/__snapshots__/FormikFieldPassword.test.js.snap index c523339ce..1a14c7612 100644 --- a/public/components/FormControls/FormikFieldPassword/__snapshots__/FormikFieldPassword.test.js.snap +++ b/public/components/FormControls/FormikFieldPassword/__snapshots__/FormikFieldPassword.test.js.snap @@ -10,6 +10,7 @@ exports[`FormikFieldPassword renders 1`] = `