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 gradle run #717

Merged
merged 1 commit into from
Jul 21, 2023
Merged

Conversation

Hailong-am
Copy link
Collaborator

Description

  1. fix gradle run stuck
  2. fix jacocoTestReport failed on macos

Issues Resolved

[List any issues this PR will resolve]

Check List

  • 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: Hailong Cui <[email protected]>
@Hailong-am
Copy link
Collaborator Author

BWC test is fixing, need have 2.10 version.

Copy link
Member

@SuZhou-Joe SuZhou-Joe left a comment

Choose a reason for hiding this comment

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

My approval may not count, need one more approval from someone with Java knowledge to sign off.

@xluo-aws xluo-aws merged commit 8efd279 into opensearch-project:main Jul 21, 2023
10 of 13 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/notifications/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/notifications/backport-2.x
# Create a new branch
git switch --create backport-717-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8efd279cfa35ad4578324d2c70a44815fe436993
# Push it to GitHub
git push --set-upstream origin backport-717-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/notifications/backport-2.x

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

Hailong-am added a commit to Hailong-am/notifications that referenced this pull request Jul 24, 2023
@Hailong-am
Copy link
Collaborator Author

backport covered in #719

Hailong-am added a commit that referenced this pull request Jul 25, 2023
…#707) (#719)

* Fix core refactor: StreamIO from common to core.common (#707)

Signed-off-by: Hailong Cui <[email protected]>
(cherry picked from commit fd8fe22)

* fix gradle run (#717)

Signed-off-by: Hailong Cui <[email protected]>

---------

Signed-off-by: Hailong Cui <[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.

3 participants