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

Update to Gradle 8.5 #3919

Merged
merged 1 commit into from
Jan 5, 2024
Merged

Update to Gradle 8.5 #3919

merged 1 commit into from
Jan 5, 2024

Conversation

reta
Copy link
Collaborator

@reta reta commented Jan 4, 2024

Description

Update to Gradle 8.5

Issues Resolved

N/A

Testing

N/A

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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: Andriy Redko <andriy.redko@aiven.io>
Copy link

codecov bot commented Jan 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (21c086c) 65.21% compared to head (55568c9) 65.17%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3919      +/-   ##
==========================================
- Coverage   65.21%   65.17%   -0.04%     
==========================================
  Files         298      298              
  Lines       21196    21196              
  Branches     3456     3456              
==========================================
- Hits        13822    13814       -8     
- Misses       5660     5668       +8     
  Partials     1714     1714              

see 1 file with indirect coverage changes

@peternied peternied merged commit 907913a into opensearch-project:main Jan 5, 2024
82 checks passed
@reta reta added the backport 2.x backport to 2.x branch label Jan 5, 2024
@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/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3919-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 907913a140e5a6032736d66c3701969cbceff708
# Push it to GitHub
git push --set-upstream origin backport/backport-3919-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

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

reta added a commit to reta/security that referenced this pull request Jan 5, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 907913a)
reta added a commit that referenced this pull request Jan 5, 2024
dlin2028 pushed a commit to dlin2028/security that referenced this pull request May 1, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants