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 com.pinterest.ktlint:ktlint-cli from 1.1.0 to 1.5.0 and appease ktlint #1336

Merged
merged 2 commits into from
Jan 14, 2025

Conversation

shiv0408
Copy link
Member

Description

Bumps com.pinterest.ktlint:ktlint-cli from 1.1.0 to 1.5.0.

Build was failing in #1317 because of newly introduced rules between this upgrade. Ran ktlint --format to apply these rules.

Suppresses backing property naming in IndexUtil.kt and RestHandlerUtil.kt files as this will require renaming the constant variable names and usage across files. Suppressing them in these files so that these rules are being followed following merge of this PR.

Signed-off-by: Shivansh Arora <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
@shiv0408 shiv0408 self-assigned this Jan 14, 2025
Copy link
Collaborator

@vikasvb90 vikasvb90 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @shiv0408 for raising the PR!

@vikasvb90 vikasvb90 merged commit f8889e6 into opensearch-project:main Jan 14, 2025
17 checks passed
@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/index-management/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/index-management/backport-2.x
# Create a new branch
git switch --create backport/backport-1336-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f8889e6a2517545dbd6c5b4130f79a7e14cc554b
# Push it to GitHub
git push --set-upstream origin backport/backport-1336-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/index-management/backport-2.x

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

@shiv0408 shiv0408 deleted the ktlint-1-5-0 branch January 14, 2025 08:55
shiv0408 added a commit to shiv0408/index-management that referenced this pull request Jan 14, 2025
shiv0408 added a commit that referenced this pull request Jan 19, 2025
* bump ktlint from 1.1.0 to 1.5.0 (#1336)

Signed-off-by: Shivansh Arora <[email protected]>

* appease ktlint

Signed-off-by: Shivansh Arora <[email protected]>

.

Signed-off-by: Shivansh Arora <[email protected]>

---------

Signed-off-by: Shivansh Arora <[email protected]>
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.

2 participants