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

Fix github CI by adding eclipse dependency in formatting.gradle #1079

Merged
merged 3 commits into from
Jan 8, 2025

Conversation

vibrantvarun
Copy link
Member

Description

This PR contains changes to fix error Failed to load eclipse jdt formatter in github CI. Added download eclipse in the formatting.gradle.

@@ -20,7 +20,6 @@
import static org.opensearch.neuralsearch.util.TestUtils.getModelId;

import org.opensearch.index.query.QueryBuilder;
import org.opensearch.index.query.QueryBuilders;
Copy link
Member Author

Choose a reason for hiding this comment

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

This is automatically removed by doing ./gradlew spotlessApply.

@heemin32
Copy link
Collaborator

heemin32 commented Jan 8, 2025

Reference: diffplug/spotless#1783 (comment)
Thanks for the quick fix!

@heemin32
Copy link
Collaborator

heemin32 commented Jan 8, 2025

Could you add change log instead of skipping it under maintenance?

@heemin32 heemin32 added the backport 2.x Label will add auto workflow to backport PR to 2.x branch label Jan 8, 2025
@vibrantvarun
Copy link
Member Author

@heemin32 shall we get 1 review from infra team?

Signed-off-by: Varun Jain <[email protected]>
Signed-off-by: Varun Jain <[email protected]>
@vibrantvarun
Copy link
Member Author

Reference: diffplug/spotless#1783 (comment) Thanks for the quick fix!

Reference diffplug/spotless#1629

@vibrantvarun
Copy link
Member Author

Waiting for 1 review from infra team. Then we will merge it.

@vibrantvarun
Copy link
Member Author

cc: @opensearch-project/admin

@vibrantvarun vibrantvarun merged commit 6ad6546 into opensearch-project:main Jan 8, 2025
38 of 39 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1079-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6ad6546e55550a3d35589bca1d61e032640439af
# Push it to GitHub
git push --set-upstream origin backport/backport-1079-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

martin-gaievski pushed a commit that referenced this pull request Jan 10, 2025
* Fix github CI by adding eclipse dependency in formatting.gradle

Signed-off-by: Varun Jain <[email protected]>

* Add changelog

Signed-off-by: Varun Jain <[email protected]>

---------

Signed-off-by: Varun Jain <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Label will add auto workflow to backport PR to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants