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 #4941

Merged
merged 2 commits into from
Sep 6, 2023
Merged

Conversation

joshuarrrr
Copy link
Member

Description

Bump OUI to 1.3.0

Issues Resolved

fixes #4584

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>
Signed-off-by: Josh Romero <rmerqg@amazon.com>
@codecov
Copy link

codecov bot commented Sep 6, 2023

Codecov Report

Merging #4941 (14d160f) into main (5eedbb5) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #4941   +/-   ##
=======================================
  Coverage   66.39%   66.39%           
=======================================
  Files        3398     3398           
  Lines       64815    64815           
  Branches    10362    10362           
=======================================
  Hits        43033    43033           
  Misses      19221    19221           
  Partials     2561     2561           
Flag Coverage Δ
Linux_1 34.84% <ø> (ø)
Linux_2 55.16% <ø> (ø)
Linux_3 44.23% <ø> (ø)
Linux_4 34.92% <ø> (ø)
Windows_1 34.86% <ø> (ø)
Windows_2 55.12% <ø> (ø)
Windows_3 44.24% <ø> (ø)
Windows_4 34.92% <ø> (ø)

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

@AMoo-Miki AMoo-Miki merged commit c035fb1 into opensearch-project:main Sep 6, 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-4941-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c035fb120eed8499e483e01f0d67d1c584732ec7
# Push it to GitHub
git push --set-upstream origin backport/backport-4941-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-4941-to-2.x.

ashwin-pc pushed a commit that referenced this pull request Sep 7, 2023
* Bump OUI to `1.3.0`

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

* bump changelog

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

* Remove unecessary sass import

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

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

---------

Signed-off-by: Josh Romero <rmerqg@amazon.com>
Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
Co-authored-by: Kawika Avilla <kavilla414@gmail.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.

[RELEASE] Release version 2.10.0
5 participants