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-beta.2 #4848

Merged

Conversation

joshuarrrr
Copy link
Member

Description

Bump OUI to 1.3.0-beta.2

Also add @opensearch/datemath dep due to renaming

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>
ashwin-pc
ashwin-pc previously approved these changes Aug 29, 2023
AMoo-Miki
AMoo-Miki previously approved these changes Aug 29, 2023
@codecov
Copy link

codecov bot commented Aug 29, 2023

Codecov Report

Merging #4848 (54aa807) into main (0188087) will increase coverage by 0.00%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #4848   +/-   ##
=======================================
  Coverage   66.30%   66.31%           
=======================================
  Files        3322     3322           
  Lines       63933    63933           
  Branches    10121    10121           
=======================================
+ Hits        42393    42394    +1     
  Misses      19051    19051           
+ Partials     2489     2488    -1     
Flag Coverage Δ
Linux_1 34.80% <ø> (-0.05%) ⬇️
Linux_2 55.15% <ø> (ø)
Linux_3 43.42% <ø> (+0.04%) ⬆️
Linux_4 35.05% <ø> (-0.05%) ⬇️
Windows_1 34.81% <ø> (-0.05%) ⬇️
Windows_2 55.12% <ø> (ø)
Windows_3 43.43% <ø> (+0.04%) ⬆️
Windows_4 35.05% <ø> (-0.05%) ⬇️

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

see 1 file with indirect coverage changes

CollapsibleNav vars now provided via theme import
see opensearch-project/oui#968

Signed-off-by: Josh Romero <rmerqg@amazon.com>
@joshuarrrr joshuarrrr dismissed stale reviews from AMoo-Miki and ashwin-pc via 54aa807 August 29, 2023 23:38
@ashwin-pc ashwin-pc merged commit 03ae2bd into opensearch-project:main Aug 30, 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-4848-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 03ae2bd8b2456238c1889176392b144d43af6c71
# Push it to GitHub
git push --set-upstream origin backport/backport-4848-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-4848-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
distinguished-contributor 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.

4 participants