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

Downgrade cypress to 12.17.4 #430

Merged
merged 3 commits into from
Jan 29, 2025

Conversation

ritvibhatt
Copy link
Contributor

@ritvibhatt ritvibhatt commented Jan 29, 2025

Description

Downgrade cypress version to 12.17.4 to match Opensearch Dashboards and upgrade artifact action to v4

Query workbench plugin is failing in dashboards 2.19.0 distribution build because of different cypress versions:

ERROR [single_version_dependencies] Multiple version ranges for the same dependency
      were found declared across different package.json files. Please consolidate
      those to match across all package.json files. Different versions for the
      same dependency is not supported.

      If you have questions about this please reach out to the operations team.

      The conflicting dependencies are:

        cypress
          12.17.4 => opensearch-dashboards
          ^13.6.0 => opensearch-query-workbench

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.

Signed-off-by: Ritvi Bhatt <[email protected]>
Ritvi Bhatt added 2 commits January 29, 2025 12:09
@sumukhswamy sumukhswamy merged commit 35ff86d into opensearch-project:main Jan 29, 2025
19 of 25 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-query-workbench/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-query-workbench/backport-2.x
# Create a new branch
git switch --create backport/backport-430-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 35ff86db3fe27b6dccf9077ab9ccdd16ddf98a27
# Push it to GitHub
git push --set-upstream origin backport/backport-430-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-query-workbench/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-430-to-2.x.

sumukhswamy pushed a commit to sumukhswamy/dashboards-query-workbench that referenced this pull request Jan 29, 2025
* downgrade cypress to 12.17.4

Signed-off-by: Ritvi Bhatt <[email protected]>

* update artifact action to v4

Signed-off-by: Ritvi Bhatt <[email protected]>

* update all artifact actions to v4

Signed-off-by: Ritvi Bhatt <[email protected]>

---------

Signed-off-by: Ritvi Bhatt <[email protected]>
Co-authored-by: Ritvi Bhatt <[email protected]>
sumukhswamy added a commit that referenced this pull request Jan 29, 2025
* downgrade cypress to 12.17.4



* update artifact action to v4



* update all artifact actions to v4



---------

Signed-off-by: Ritvi Bhatt <[email protected]>
Co-authored-by: ritvibhatt <[email protected]>
Co-authored-by: Ritvi Bhatt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants