Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 1.x to be same as Reporting Repo #7

Merged
merged 5 commits into from
Jan 13, 2023
Merged

Update 1.x to be same as Reporting Repo #7

merged 5 commits into from
Jan 13, 2023

Conversation

rupal-bq
Copy link
Contributor

@rupal-bq rupal-bq commented Jan 5, 2023

Description

  • Cherry picked last commits
  • Updated workflow
  • Cherry picked commits to add necessary files

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

opensearch-trigger-bot bot and others added 4 commits January 5, 2023 19:57
* Add workaround for ERR_ADDRESS_INVALID in doc

Signed-off-by: Rupal Mahajan <[email protected]>

* nit

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit c5bb86acbe38e2d4946b71ca287253a9cf4d853e)

Co-authored-by: Rupal Mahajan <[email protected]>
Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>
(cherry picked from commit 3240685444bc4c5aac23bdecad5b6c480d5a3d89)

Co-authored-by: Rupal Mahajan <[email protected]>
Signed-off-by: Rupal Mahajan <[email protected]>
* Add docs

Signed-off-by: Rupal Mahajan <[email protected]>

* Update docs to repo name change

Signed-off-by: Rupal Mahajan <[email protected]>

* Updated MAINTAINERS.md to match recommended opensearch-project format.

Signed-off-by: Rupal Mahajan <[email protected]>

Signed-off-by: Rupal Mahajan <[email protected]>
@rupal-bq rupal-bq marked this pull request as ready for review January 5, 2023 20:57
This reverts commit 171cd23.

Signed-off-by: Rupal Mahajan <[email protected]>
@pjfitzgibbons
Copy link
Contributor

Please see my comment in #6 I think this should be done as a forward-merge from main.

@joshuali925
Copy link
Member

Please see my comment in #6 I think this should be done as a forward-merge from main.

assuming forward-merge means git merge main, this is 1.x, main is way ahead and will bringing in other changes?

- name: Checkout Plugin
uses: actions/checkout@v1
with:
path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}

- name: Add Chromium Binary to Reporting for Testing
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this step no longer be used?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove chromium changes are not backported to 1.x (assuming 1.4 release is not planned). Only backported to 1.3 branch for possible next patch release. I will double check this while raising PR for 1.3

cd build
mkdir -p ./{linux-x64,linux-arm64}/opensearch-dashboards/${{ env.PLUGIN_NAME }}
cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip
cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.ARTIFACT_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip

cd linux-x64
wget https://github.com/opensearch-project/dashboards-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I believe the artifacts no longer need to wrap the chromium zip?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same reason for this. changes are not backported to 1.x.

@rupal-bq rupal-bq merged commit f30c73d into opensearch-project:1.x Jan 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants