Skip to content

Commit deb9cd5

Browse files
committed
test
1 parent 855fdfe commit deb9cd5

File tree

1 file changed

+23
-16
lines changed

1 file changed

+23
-16
lines changed

.github/actions/patch-dependencies/action.yml

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ runs:
6464
env.patch_otel_java_instrumentation == 'true' }}
6565
shell: bash
6666

67-
# - name: Build opentelemetry-java with tests
68-
# uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
69-
# if: ${{ env.patch_otel_java == 'true' && inputs.run_tests != 'false' }}
70-
# with:
71-
# arguments: build publishToMavenLocal --scan --no-daemon
72-
# build-root-directory: opentelemetry-java
67+
- name: Build opentelemetry-java with tests
68+
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
69+
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests != 'true' }}
70+
with:
71+
arguments: build publishToMavenLocal --scan --no-daemon
72+
build-root-directory: opentelemetry-java
7373

7474
- name: Build opentelemetry-java
7575
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
76-
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests != 'true' }}
76+
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests == 'true' }}
7777
with:
7878
arguments: publishToMavenLocal --scan --no-daemon
7979
build-root-directory: opentelemetry-java
@@ -83,9 +83,16 @@ runs:
8383
if: ${{ env.patch_otel_java == 'true' }}
8484
shell: bash
8585

86+
- name: Build opentelemetry-java-contrib with tests
87+
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
88+
if: ${{ env.patch_otel_java_contrib == 'true' && inputs.run_tests != 'true' }}
89+
with:
90+
arguments: build publishToMavenLocal --scan --no-daemon
91+
build-root-directory: opentelemetry-java-contrib
92+
8693
- name: Build opentelemetry-java-contrib
8794
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
88-
if: ${{ env.patch_otel_java_contrib == 'true' }}
95+
if: ${{ env.patch_otel_java_contrib == 'true' && inputs.run_tests == 'true' }}
8996
with:
9097
arguments: publishToMavenLocal --scan --no-daemon
9198
build-root-directory: opentelemetry-java-contrib
@@ -95,21 +102,21 @@ runs:
95102
if: ${{ env.patch_otel_java_contrib == 'true' }}
96103
shell: bash
97104

98-
# - name: Build opentelemetry-java-instrumentation with tests
99-
# uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
100-
# if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests != 'false' }}
101-
# with:
102-
# arguments: check -x spotlessCheck publishToMavenLocal --scan --no-daemon
103-
# build-root-directory: opentelemetry-java-instrumentation
105+
- name: Build opentelemetry-java-instrumentation with tests
106+
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
107+
if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests != 'true' }}
108+
with:
109+
arguments: check -x spotlessCheck publishToMavenLocal --scan --no-daemon
110+
build-root-directory: opentelemetry-java-instrumentation
104111

105112
- name: Build opentelemetry java instrumentation
106113
uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
107-
if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests != 'true' }}
114+
if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests == 'true' }}
108115
with:
109116
arguments: publishToMavenLocal --scan --no-daemon
110117
build-root-directory: opentelemetry-java-instrumentation
111118

112119
- name: cleanup opentelmetry-java-instrumentation
113120
run: rm -rf opentelemetry-java-instrumentation
114121
if: ${{ env.patch_otel_java_instrumentation == 'true' }}
115-
shell: bash
122+
shell: bash

0 commit comments

Comments
 (0)