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

Updating setup-java, byte buddy, jacoco and mockito dependencies #1368

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

amitgalitz
Copy link
Member

Description

Updating several different dependencies that we have outdated depandabot PRs for.
Also testing out this solution for some of our workflows that still have checkout@v3.

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.

Copy link

codecov bot commented Nov 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.01%. Comparing base (37d755a) to head (71418d0).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##               main    #1368      +/-   ##
============================================
- Coverage     80.07%   80.01%   -0.07%     
+ Complexity     5672     5666       -6     
============================================
  Files           533      533              
  Lines         23438    23438              
  Branches       2334     2334              
============================================
- Hits          18769    18753      -16     
- Misses         3560     3575      +15     
- Partials       1109     1110       +1     
Flag Coverage Δ
plugin 80.01% <ø> (-0.07%) ⬇️

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

see 6 files with indirect coverage changes

@@ -28,7 +28,7 @@ jobs:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 21
- uses: actions/checkout@v4
- uses: aws-actions/[email protected].1
- uses: aws-actions/[email protected].2
Copy link
Member

Choose a reason for hiding this comment

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

Suggest just use v4 instead of specific version unless you have specific requirements here.

Thanks!

Copy link
Member Author

Choose a reason for hiding this comment

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

We keep getting depandabot PRs for this, do you know why we are getting this and other repos aren't? #1182

Copy link
Member

Choose a reason for hiding this comment

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

If you use v4 it will automatically link to the latest v4.x.x.

Copy link
Member Author

Choose a reason for hiding this comment

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

changed to v4

Copy link
Member

@peterzhuamazon peterzhuamazon left a comment

Choose a reason for hiding this comment

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

env:
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

The above can be completely removed as github already deprecate this params.

ohltyler
ohltyler previously approved these changes Nov 18, 2024
joshpalis
joshpalis previously approved these changes Nov 18, 2024
Signed-off-by: Amit Galitzky <[email protected]>
@amitgalitz amitgalitz merged commit cad9610 into opensearch-project:main Nov 25, 2024
19 of 20 checks passed
@opensearch-trigger-bot
Copy link

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/anomaly-detection/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/anomaly-detection/backport-2.x
# Create a new branch
git switch --create backport/backport-1368-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 cad961074760baaf31e984055b3a57d83a25d7e3
# Push it to GitHub
git push --set-upstream origin backport/backport-1368-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/anomaly-detection/backport-2.x

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport-failed infra Changes to infrastructure, testing, CI/CD, pipelines, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants