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

[Spotless] Applying Google Code Format for legacy directory (pt 3/4) #21 #1991

Merged

Conversation

MitchellGale
Copy link
Contributor

Description

Applies spotless for part of legacy directory in project. Sets checkstyle to not fail on failure for legacy directory.

Issues Resolved

#1101

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • 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.

Signed-off-by: Mitchell Gale <[email protected]>
@codecov
Copy link

codecov bot commented Aug 18, 2023

Codecov Report

Merging #1991 (654de4f) into main (b977f1e) will not change coverage.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1991   +/-   ##
=========================================
  Coverage     97.33%   97.33%           
  Complexity     4657     4657           
=========================================
  Files           408      408           
  Lines         12097    12097           
  Branches        829      829           
=========================================
  Hits          11775    11775           
  Misses          315      315           
  Partials          7        7           
Flag Coverage Δ
sql-engine 97.33% <ø> (ø)

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

Signed-off-by: Mitchell Gale <[email protected]>
@acarbonetto acarbonetto merged commit 445c9e6 into opensearch-project:main Aug 21, 2023
@acarbonetto acarbonetto deleted the dev/sl_GoogleJavaFormat21 branch August 21, 2023 20:20
@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/sql/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.x
# Create a new branch
git switch --create backport/backport-1991-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 445c9e646a9a2805deed64c3fc984c97a5abde43
# Push it to GitHub
git push --set-upstream origin backport/backport-1991-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.x

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

@joshuali925
Copy link
Member

ported by #2016, removing backport failed label

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.

4 participants