Skip to content

Commit 3b35c40

Browse files
authored
Updates versions and fixes the unit test workflow (#7)
Signed-off-by: Drew Baugher <[email protected]>
1 parent 4499c74 commit 3b35c40

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

.github/workflows/cypress-workflow.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: E2E Cypress tests
22
on:
3+
pull_request:
4+
branches:
5+
- main
36
push:
47
branches:
58
- main
@@ -23,8 +26,8 @@ jobs:
2326
uses: actions/checkout@v2
2427
with:
2528
path: index-management
26-
# TODO: Move this after OpenSearch-Dashboards plugin setup so we can pull down the correct branch to support all opendistro branches
27-
repository: opendistro-for-elasticsearch/index-management
29+
repository: opensearch-project/index-management
30+
ref: main
2831
- name: Run elasticsearch with plugin
2932
run: |
3033
cd index-management
@@ -35,16 +38,11 @@ jobs:
3538
uses: actions/checkout@v2
3639
with:
3740
path: index-management-dashboards-plugin
38-
- name: Get OpenSearch-Dashboards version
39-
id: opensearch_dashboards_version
40-
run: |
41-
echo "::set-output name=opensearch_dashboards_version::$(node -p "(require('./index-management-dashboards-plugin/opensearch_dashboards.json').opensearchDashboardsVersion).match(/[.0-9]+/)[0]")"
4241
- name: Checkout OpenSearch-Dashboards
4342
uses: actions/checkout@v2
4443
with:
4544
repository: opensearch-project/OpenSearch-Dashboards
46-
ref: ${{ steps.opensearch_dashboards_version.outputs.opensearch_dashboards_version }}
47-
token: ${{ secrets.GITHUB_OPENSEARCH_DASHBOARDS_OSS }}
45+
ref: main
4846
path: OpenSearch-Dashboards
4947
- name: Get node and yarn versions
5048
id: versions

.github/workflows/unit-tests-workflow.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Unit tests workflow
22
on:
3+
pull_request:
4+
branches:
5+
- main
36
push:
47
branches:
58
- main
@@ -13,16 +16,11 @@ jobs:
1316
uses: actions/checkout@v2
1417
with:
1518
path: index-management-dashboards-plugin
16-
- name: Get OpenSearch-Dashboards version
17-
id: opensearch_dashboards_version
18-
run: |
19-
echo "::set-output name=opensearch_dashboards_version::$(node -p "(require('./index-management-dashboards-plugin/opensearch_dashboards.json').opensearchDashboardsVersion).match(/[.0-9]+/)[0]")"
2019
- name: Checkout OpenSearch-Dashboards
2120
uses: actions/checkout@v2
2221
with:
2322
repository: opensearch-project/OpenSearch-Dashboards
24-
ref: ${{ steps.opensearch_dashboards_version.outputs.opensearch_dashboards_version }}
25-
token: ${{ secrets.GITHUB_OPENSEARCH_DASHBOARDS_OSS }}
23+
ref: main
2624
path: OpenSearch-Dashboards
2725
- name: Get node and yarn versions
2826
id: versions

opensearch_dashboards.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "indexManagementOpenSearchDashboards",
3-
"version": "1.13.0.1",
4-
"opensearchDashboardsVersion": "7.10.2",
3+
"version": "1.0.0.0",
4+
"opensearchDashboardsVersion": "1.0.0",
55
"configPath": ["opensearch_index_management"],
66
"requiredPlugins": ["navigation"],
77
"server": true,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "opensearch_index_management_dashboards",
3-
"version": "1.13.0.1",
3+
"version": "1.0.0.0",
44
"description": "Opensearch Dashboards plugin for Index Management",
55
"main": "index.js",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)