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 semver to latest legacy version #565

Merged
merged 1 commit into from
Jul 20, 2023

Conversation

VijayanB
Copy link
Member

Description

Bumped semver versions to address dependabot alerts.

Issues Resolved

Check List

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

Bumped semver versions to address dependabot alerts.

Signed-off-by: Vijayan Balasubramanian <[email protected]>
@VijayanB
Copy link
Member Author

1. Add semver to resolutions 
2. Delete yarn.lock
3. run  yarn osd bootstrap to regenerate yarn.lock file

@kaituo
Copy link
Collaborator

kaituo commented Jul 20, 2023

added backport to 1.3 tag. Hopefully the workflow will succeed @VijayanB

@codecov
Copy link

codecov bot commented Jul 20, 2023

Codecov Report

Merging #565 (1f724c0) into main (a334f08) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #565   +/-   ##
=======================================
  Coverage   50.28%   50.28%           
=======================================
  Files         166      166           
  Lines        5590     5590           
  Branches     1055     1055           
=======================================
  Hits         2811     2811           
  Misses       2508     2508           
  Partials      271      271           

@VijayanB
Copy link
Member Author

@kaituo looks like issue from AD backend plugin. Is anyone working on that?

@kaituo
Copy link
Collaborator

kaituo commented Jul 20, 2023

@VijayanB Will prepare a PR to fix backend.

@ohltyler
Copy link
Member

Thanks for updating!

@ohltyler ohltyler merged commit 306f5fa into opensearch-project:main Jul 20, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-565-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 306f5facb5cd193b33a46562297c5e394d4a8b16
# Push it to GitHub
git push --set-upstream origin backport/backport-565-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-565-to-1.3.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 20, 2023
Bumped semver versions to address dependabot alerts.

Signed-off-by: Vijayan Balasubramanian <[email protected]>
(cherry picked from commit 306f5fa)
kaituo pushed a commit that referenced this pull request Jul 20, 2023
Bumped semver versions to address dependabot alerts.

Signed-off-by: Vijayan Balasubramanian <[email protected]>
(cherry picked from commit 306f5fa)

Co-authored-by: Vijayan Balasubramanian <[email protected]>
VijayanB added a commit to VijayanB/anomaly-detection-dashboards-plugin that referenced this pull request Jul 20, 2023
ohltyler pushed a commit that referenced this pull request Jul 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.3 backport 2.x dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants