From 5754217c15cc0cc4868a74242910df016365389f Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 29 Jun 2021 13:53:45 -0700 Subject: [PATCH 1/6] Bump version to 1.0.0.0 Signed-off-by: Joshua Li --- .github/workflows/release-workflow.yml | 2 +- .github/workflows/test-and-build-workflow.yml | 2 +- gantt-chart/opensearch_dashboards.json | 4 ++-- gantt-chart/package.json | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index 9dc5842..0ee3851 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -9,7 +9,7 @@ on: env: PLUGIN_NAME: gantt-chart-dashboards OPENSEARCH_VERSION: '1.0' - OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1 + OPENSEARCH_PLUGIN_VERSION: 1.0.0.0 jobs: diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index ef93118..1b63e4f 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -6,7 +6,7 @@ on: [pull_request, push] env: PLUGIN_NAME: gantt-chart-dashboards OPENSEARCH_VERSION: '1.0' - OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1 + OPENSEARCH_PLUGIN_VERSION: 1.0.0.0 jobs: diff --git a/gantt-chart/opensearch_dashboards.json b/gantt-chart/opensearch_dashboards.json index 5722aab..17658d5 100644 --- a/gantt-chart/opensearch_dashboards.json +++ b/gantt-chart/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "ganttChartDashboards", - "version": "1.0.0.0-rc1", - "opensearchDashboardsVersion": "1.0.0-rc1", + "version": "1.0.0.0", + "opensearchDashboardsVersion": "1.0.0", "requiredPlugins": [ "visualizations", "data" diff --git a/gantt-chart/package.json b/gantt-chart/package.json index 29027f9..bfc8e56 100644 --- a/gantt-chart/package.json +++ b/gantt-chart/package.json @@ -1,9 +1,9 @@ { "name": "gantt-chart-dashboards", - "version": "1.0.0.0-rc1", + "version": "1.0.0.0", "opensearchDashboards": { - "version": "1.0.0-rc1", - "templateVersion": "1.0.0-rc1" + "version": "1.0.0", + "templateVersion": "1.0.0" }, "license": "Apache-2.0", "scripts": { From e171ea8eae81a999fe8c2026831dca5bf32e39a9 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 29 Jun 2021 13:53:51 -0700 Subject: [PATCH 2/6] Add release notes Signed-off-by: Joshua Li --- ...oards-visualizations.release-notes-1.0.0.0.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md diff --git a/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md b/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md new file mode 100644 index 0000000..d064c43 --- /dev/null +++ b/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md @@ -0,0 +1,16 @@ +## Version 1.0.0.0 Release Notes + +Compatible with OpenSearch 1.0.0 + +### Bug Fixes +* Bump glob-parent from 5.1.1 to 5.1.2 in /gantt-chart ([#14](https://github.com/opensearch-project/repo/pull/14)) + +### Infrastructure +* Add unit tests and codecov ([#19](https://github.com/opensearch-project/repo/pull/19)) + +### Documentation +* Level up markdown contents ([#16](https://github.com/opensearch-project/repo/pull/16)) + +### Maintenance +* Bump version to 1.0.0.0 and add release notes ([#20](https://github.com/opensearch-project/repo/pull/20)) + From 4de5e9d8e4a8d4cc2e10791df5494b1cd5edbc19 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 29 Jun 2021 13:56:57 -0700 Subject: [PATCH 3/6] Update release notes Signed-off-by: Joshua Li --- ...rch-dashboards-visualizations.release-notes-1.0.0.0.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md b/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md index d064c43..7e16bb3 100644 --- a/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md +++ b/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md @@ -3,14 +3,14 @@ Compatible with OpenSearch 1.0.0 ### Bug Fixes -* Bump glob-parent from 5.1.1 to 5.1.2 in /gantt-chart ([#14](https://github.com/opensearch-project/repo/pull/14)) +* Bump glob-parent from 5.1.1 to 5.1.2 in /gantt-chart ([#14](https://github.com/opensearch-project/dashboards-visualizations/pull/14)) ### Infrastructure -* Add unit tests and codecov ([#19](https://github.com/opensearch-project/repo/pull/19)) +* Add unit tests and codecov ([#19](https://github.com/opensearch-project/dashboards-visualizations/pull/19)) ### Documentation -* Level up markdown contents ([#16](https://github.com/opensearch-project/repo/pull/16)) +* Level up markdown contents ([#16](https://github.com/opensearch-project/dashboards-visualizations/pull/16)) ### Maintenance -* Bump version to 1.0.0.0 and add release notes ([#20](https://github.com/opensearch-project/repo/pull/20)) +* Bump version to 1.0.0.0 and add release notes ([#20](https://github.com/opensearch-project/dashboards-visualizations/pull/20)) From e10fdb4abfd014840fd493faf5bc9e3e058c1329 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 30 Jun 2021 14:53:06 -0700 Subject: [PATCH 4/6] Update node version Signed-off-by: Joshua Li --- .github/workflows/test-and-build-workflow.yml | 7 ++++++- gantt-chart/package.json | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index 8c1e0b6..b3ab777 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -23,10 +23,15 @@ jobs: repository: opensearch-project/Opensearch-Dashboards ref: ${{ env.OPENSEARCH_VERSION }} path: dashboards-visualizations/OpenSearch-Dashboards + - name: Get node and yarn versions + id: versions_step + run: | + echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")" + echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")" - name: Setup Node uses: actions/setup-node@v1 with: - node-version: '10.23.1' + node-version: ${{ steps.versions_step.outputs.node_version }} - name: Move Gantt Chart to Plugins Dir run: | mv gantt-chart OpenSearch-Dashboards/plugins diff --git a/gantt-chart/package.json b/gantt-chart/package.json index bada46a..0803b4a 100644 --- a/gantt-chart/package.json +++ b/gantt-chart/package.json @@ -28,9 +28,5 @@ "eslint": "^6.8.0", "jest": "^26.4.2", "jest-dom": "^4.0.0" - }, - "engines": { - "node": "10.23.1", - "yarn": "^1.21.1" } } From 939e2c052f5fd647366190ffb238b1adbdb06100 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 30 Jun 2021 15:27:20 -0700 Subject: [PATCH 5/6] Update release notes Signed-off-by: Joshua Li --- ...earch-dashboards-visualizations.release-notes-1.0.0.0.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md b/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md index 7e16bb3..6df56ac 100644 --- a/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md +++ b/release-notes/opensearch-dashboards-visualizations.release-notes-1.0.0.0.md @@ -14,3 +14,9 @@ Compatible with OpenSearch 1.0.0 ### Maintenance * Bump version to 1.0.0.0 and add release notes ([#20](https://github.com/opensearch-project/dashboards-visualizations/pull/20)) +### OpenSearch Migration +* Add release notes for version 1.0.0.0-rc1 ([#13](https://github.com/opensearch-project/dashboards-visualizations/pull/13)) +* Update version to rc1 ([#12](https://github.com/opensearch-project/dashboards-visualizations/pull/12)) +* Update documentation link to opensearch ([#11](https://github.com/opensearch-project/dashboards-visualizations/pull/11)) +* Update issue template with multiple labels ([#8](https://github.com/opensearch-project/dashboards-visualizations/pull/8)) +* Rename artifacts to follow camel case ([#7](https://github.com/opensearch-project/dashboards-visualizations/pull/7)) From 076d662930ce74da913368f5329ac6f2eb2af11d Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 30 Jun 2021 15:29:28 -0700 Subject: [PATCH 6/6] Update CI Signed-off-by: Joshua Li --- .github/workflows/test-and-build-workflow.yml | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index b3ab777..8a18874 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -16,44 +16,61 @@ jobs: steps: - name: Checkout Plugin - uses: actions/checkout@v1 + uses: actions/checkout@v2 + - name: Checkout OpenSearch Dashboards - uses: actions/checkout@v1 + uses: actions/checkout@v2 with: repository: opensearch-project/Opensearch-Dashboards ref: ${{ env.OPENSEARCH_VERSION }} path: dashboards-visualizations/OpenSearch-Dashboards + - name: Get node and yarn versions id: versions_step run: | - echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")" - echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")" - - name: Setup Node + echo "::set-output name=node_version::$(node -p "(require('./dashboards-visualizations/OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")" + echo "::set-output name=yarn_version::$(node -p "(require('./dashboards-visualizations/OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")" + + - name: Setup node uses: actions/setup-node@v1 with: node-version: ${{ steps.versions_step.outputs.node_version }} + registry-url: 'https://registry.npmjs.org' + + - name: Install correct yarn version for OpenSearch Dashboards + run: | + npm uninstall -g yarn + echo "Installing yarn ${{ steps.versions_step.outputs.yarn_version }}" + npm i -g yarn@${{ steps.versions_step.outputs.yarn_version }} + - name: Move Gantt Chart to Plugins Dir run: | - mv gantt-chart OpenSearch-Dashboards/plugins + mv gantt-chart ./dashboards-visualizations/OpenSearch-Dashboards/plugins + - name: Plugin Bootstrap run: | - cd OpenSearch-Dashboards/plugins/gantt-chart + cd ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart yarn osd bootstrap + - name: Test run: | - cd OpenSearch-Dashboards/plugins/gantt-chart + cd ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart yarn test --coverage + - name: Upload coverage uses: codecov/codecov-action@v1 with: token: ${{ secrets.CODECOV_TOKEN }} + direcotry: ./dashboards-visualizations/OpenSearch-Dashboards/plugins/trace-analytics + - name: Build Artifact run: | - cd OpenSearch-Dashboards/plugins/gantt-chart + cd ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart yarn build mv ./build/*.zip ./build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}.zip + - name: Upload Artifact uses: actions/upload-artifact@v1 with: name: gantt-chart - path: OpenSearch-Dashboards/plugins/gantt-chart/build + path: ./dashboards-visualizations/OpenSearch-Dashboards/plugins/gantt-chart/build