Skip to content

Merge 2.11.5 back into main branch #1201

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 22, 2025
Merged

Merge 2.11.5 back into main branch #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e18072
Merge 2.11.5 back into main branch
majanjua-amzn Sep 15, 2025
db0084d
Fix patch typo
majanjua-amzn Sep 19, 2025
131d68a
Improve build time
majanjua-amzn Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions .github/actions/patch-dependencies/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ runs:
if [[ -f .github/patches/opentelemetry-java.patch ]]; then
echo 'patch_otel_java=true' >> $GITHUB_ENV
fi
if [[ -f .github/patches/opentelemetry-java-instrumentation.patch ]]; then
echo 'patch_otel_java_instrumentation=true' >> $GITHUB_ENV
fi
if [[ -f .github/patches/opentelemetry-java-contrib.patch ]]; then
echo 'patch_otel_java_contrib=true' >> $GITHUB_ENV
fi
Expand All @@ -57,21 +60,22 @@ runs:
- name: Clone and patch repositories
run: .github/scripts/patch.sh
if: ${{ env.patch_otel_java == 'true' ||
env.patch_otel_java_contrib == 'true' }}
env.patch_otel_java_contrib == 'true' ||
env.patch_otel_java_instrumentation == 'true' }}
shell: bash

- name: Build opentelemetry-java with tests
uses: gradle/gradle-build-action@v2
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests != 'false' }}
with:
arguments: build publishToMavenLocal
arguments: build publishToMavenLocal --scan --no-daemon
build-root-directory: opentelemetry-java

- name: Build opentelemetry-java
uses: gradle/gradle-build-action@v2
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests == 'false' }}
with:
arguments: publishToMavenLocal
arguments: publishToMavenLocal --scan --no-daemon
build-root-directory: opentelemetry-java

- name: cleanup opentelemetry-java
Expand All @@ -83,17 +87,36 @@ runs:
uses: gradle/gradle-build-action@v2
if: ${{ env.patch_otel_java_contrib == 'true' && inputs.run_tests != 'false' }}
with:
arguments: build publishToMavenLocal
arguments: build publishToMavenLocal --scan --no-daemon
build-root-directory: opentelemetry-java-contrib

- name: Build opentelemetry-java-contrib
uses: gradle/gradle-build-action@v2
if: ${{ env.patch_otel_java_contrib == 'true' && inputs.run_tests == 'false' }}
with:
arguments: publishToMavenLocal
arguments: publishToMavenLocal --scan --no-daemon
build-root-directory: opentelemetry-java-contrib

- name: cleanup opentelemetry-java-contrib
run: rm -rf opentelemetry-java-contrib
if: ${{ env.patch_otel_java_contrib == 'true' }}
shell: bash

- name: Build opentelemetry-java-instrumentation with tests
uses: gradle/gradle-build-action@v2
if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests != 'false' }}
with:
arguments: check -x spotlessCheck publishToMavenLocal --scan --no-daemon
build-root-directory: opentelemetry-java-instrumentation

- name: Build opentelemetry java instrumentation
uses: gradle/gradle-build-action@v2
if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests == 'false' }}
with:
arguments: publishToMavenLocal --scan --no-daemon
build-root-directory: opentelemetry-java-instrumentation

- name: cleanup opentelmetry-java-instrumentation
run: rm -rf opentelemetry-java-instrumentation
if: ${{ env.patch_otel_java_instrumentation == 'true' }}
shell: bash
Loading
Loading