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

Bumped cypress version to 12.17.4. Bump cross-spawn to 7.0.6 #1198

Merged
merged 3 commits into from
Jan 30, 2025

Conversation

AWSHurneyt
Copy link
Collaborator

Description

  1. Bumped cypress version to 12.17.4.
  2. Bump cross-spawn to 7.0.6

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc 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.

@AWSHurneyt
Copy link
Collaborator Author

The cypress test github workflow needs to be reconfigured to execute the tests after bumping the cypress version. Will investigate that separately. For now, need to merge this bump to unblock 2.19 release.

@amsiglan amsiglan merged commit 45ce91b into opensearch-project:main Jan 30, 2025
9 of 11 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/alerting-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport-1198-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 45ce91bd53c880c976299598ac2b5694c2c609f8
# Push it to GitHub
git push --set-upstream origin backport-1198-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting-dashboards-plugin/backport-2.x

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

AWSHurneyt added a commit to AWSHurneyt/alerting-dashboards-plugin that referenced this pull request Jan 30, 2025
…rch-project#1198)

* Fix cross-spawn CVE.

Signed-off-by: AWSHurneyt <[email protected]>

* Bump cypress, and cross-spawn version.

Signed-off-by: AWSHurneyt <[email protected]>

* Fix cross-spawn version..

Signed-off-by: AWSHurneyt <[email protected]>

---------

Signed-off-by: AWSHurneyt <[email protected]>
AWSHurneyt added a commit that referenced this pull request Jan 30, 2025
…1199)

* Fix cross-spawn CVE.



* Bump cypress, and cross-spawn version.



* Fix cross-spawn version..



---------

Signed-off-by: AWSHurneyt <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 30, 2025
…1199)

* Fix cross-spawn CVE.

* Bump cypress, and cross-spawn version.

* Fix cross-spawn version..

---------

Signed-off-by: AWSHurneyt <[email protected]>
(cherry picked from commit 7053262)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AWSHurneyt pushed a commit that referenced this pull request Jan 30, 2025
…1199) (#1200)

* Fix cross-spawn CVE.

* Bump cypress, and cross-spawn version.

* Fix cross-spawn version..

---------


(cherry picked from commit 7053262)

Signed-off-by: AWSHurneyt <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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