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 PR and Main Build for patched dependencies jobs #669

Closed
wants to merge 3 commits into from

Conversation

PaurushGarg
Copy link
Member

@PaurushGarg PaurushGarg commented Dec 20, 2023

Issue #, if available:

Description of changes:

Creating PR to this release v1.32.x branch post v1.32.0 release but before merging to main, as merging to main has CI failure here.

  • This pr is to fix the above CI error.
  • Includes maven cache in prbuild to make subsequent pr builds faster.
  • Updates patch workflows and scripts so that they are not scoped to only release branches.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

…adding maven cache in pr buid for faster build
@PaurushGarg PaurushGarg requested a review from a team as a code owner December 20, 2023 22:53
@PaurushGarg PaurushGarg changed the title Removing if clause for patch depedencies for release branch only and … Update PR and Main Build for patched dependencies jobs Dec 20, 2023
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (release/v1.32.x@203cbaa). Click here to learn what that means.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@                Coverage Diff                 @@
##             release/v1.32.x     #669   +/-   ##
==================================================
  Coverage                   ?   50.73%           
  Complexity                 ?      264           
==================================================
  Files                      ?       39           
  Lines                      ?     1301           
  Branches                   ?      141           
==================================================
  Hits                       ?      660           
  Misses                     ?      609           
  Partials                   ?       32           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -25,7 +25,7 @@ jobs:
testpatch:
name: Test patches applied to dependencies
runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core
if: ${{ startsWith(github.ref_name, 'release/v') }}
if: ${{ hashFiles('.github/patches/**/opentelemetry-java-*.patch') != ''}}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if: ${{ hashFiles('.github/patches/**/opentelemetry-java-*.patch') != ''}}
if: ${{ hashFiles('.github/patches/**/opentelemetry-java-*.patch') != ''}}

I don't think we need this conditional anymore. Running the patch action is a NOOP if no patch files exist.

@PaurushGarg
Copy link
Member Author

closing pr as another relevant pr has been merged: #670

@thpierce thpierce deleted the update-pr-and-main-build branch August 27, 2024 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants