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

[Manual backport 2.x]Bump @opensearch-project/opensearch-next from 2.9.0 to 2.13.0 (#8886) #9039

Merged
merged 1 commit into from
Dec 11, 2024

Conversation

AMoo-Miki
Copy link
Collaborator

cherry-picked commit 473c0ae from #8886

Copy link
Contributor

❌ Invalid Changelog Heading

The '## Changelog' heading in your PR description is either missing or malformed. Please make sure that your PR description includes a '## Changelog' heading with proper spelling, capitalization, spacing, and Markdown syntax.

Copy link

codecov bot commented Dec 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.88%. Comparing base (cd2faad) to head (8be5659).
Report is 2 commits behind head on 2.x.

Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #9039      +/-   ##
==========================================
- Coverage   60.88%   60.88%   -0.01%     
==========================================
  Files        3807     3807              
  Lines       91162    91162              
  Branches    14393    14393              
==========================================
- Hits        55505    55503       -2     
- Misses      32130    32131       +1     
- Partials     3527     3528       +1     
Flag Coverage Δ
Linux_1 29.04% <ø> (ø)
Linux_2 56.52% <ø> (ø)
Linux_3 37.83% <ø> (-0.01%) ⬇️
Linux_4 30.02% <ø> (ø)
Windows_1 29.06% <ø> (ø)
Windows_2 56.48% <ø> (ø)
Windows_3 37.84% <ø> (ø)
Windows_4 30.02% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@AMoo-Miki
Copy link
Collaborator Author

ci11 is failing due to a cypress permission error which could be related to somehow v13 being used; ignoring that and merging.

@AMoo-Miki AMoo-Miki merged commit e66c7c3 into opensearch-project:2.x Dec 11, 2024
66 of 69 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 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/OpenSearch-Dashboards/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.17
# Create a new branch
git switch --create backport/backport-9039-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e66c7c39d229242479cd4ddc9402640e4c032c74
# Push it to GitHub
git push --set-upstream origin backport/backport-9039-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.17

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

@AMoo-Miki
Copy link
Collaborator Author

Will try backporting after 9044 is merged.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 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/OpenSearch-Dashboards/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.17
# Create a new branch
git switch --create backport/backport-9039-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e66c7c39d229242479cd4ddc9402640e4c032c74
# Push it to GitHub
git push --set-upstream origin backport/backport-9039-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.17

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

@AMoo-Miki
Copy link
Collaborator Author

manually backported.

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