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

Bump OUI to 1.3.0-rc.1 #4897

Merged

Conversation

joshuarrrr
Copy link
Member

Description

Bump OUI to 1.3.0-rc.2

Issues Resolved

Part of preparation for #4584 and opensearch-project/oui#958

Screenshot

Testing the changes

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
    • yarn test:ftr
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

Signed-off-by: Josh Romero <rmerqg@amazon.com>
@codecov
Copy link

codecov bot commented Sep 1, 2023

Codecov Report

Merging #4897 (6968a03) into main (83cd7f6) will not change coverage.
Report is 2 commits behind head on main.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #4897   +/-   ##
=======================================
  Coverage   66.39%   66.39%           
=======================================
  Files        3397     3397           
  Lines       64804    64804           
  Branches    10360    10360           
=======================================
  Hits        43028    43028           
  Misses      19217    19217           
  Partials     2559     2559           
Flag Coverage Δ
Linux_1 34.85% <ø> (ø)
Linux_2 55.15% <ø> (ø)
Linux_3 44.24% <ø> (+<0.01%) ⬆️
Linux_4 34.92% <ø> (ø)
Windows_1 34.87% <ø> (ø)
Windows_2 55.12% <ø> (ø)
Windows_3 44.24% <ø> (-0.01%) ⬇️
Windows_4 34.92% <ø> (ø)

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

@joshuarrrr joshuarrrr merged commit d590df6 into opensearch-project:main Sep 1, 2023
@joshuarrrr joshuarrrr added backport 2.x not in release PRs backported to already shipped releases with no future release planned labels Sep 1, 2023
@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/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-4897-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d590df683f0904cd4ffd2116e701b4822664060f
# Push it to GitHub
git push --set-upstream origin backport/backport-4897-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not in release PRs backported to already shipped releases with no future release planned Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants