Skip to content

Commit 1ed8671

Browse files
committed
updating action & pr-build.yml files
1 parent 9059339 commit 1ed8671

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ runs:
6262

6363
- name: Setup Gradle
6464
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
65-
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests != 'false' }}
6665

6766
- name: Build opentelemetry-java with tests
67+
if: ${{ env.patch_otel_java == 'true' && inputs.run_tests != 'false' }}
6868
build-root-directory: opentelemetry-java
6969
run: ./gradlew build publishToMavenLocal
7070

@@ -92,11 +92,11 @@ runs:
9292

9393
- name: Build opentelemetry-java-contrib
9494
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
95-
if: ${{ env.patch_otel_java_contrib == 'true' && inputs.run_tests == 'false' }}
9695

9796
- name: Build opentelemetry-java-contrib
97+
if: ${{ env.patch_otel_java_contrib == 'true' && inputs.run_tests == 'false' }}
9898
build-root-directory: opentelemetry-java-contrib
99-
run: ./gradlew build publishToMavenLocal
99+
run: ./gradlew publishToMavenLocal
100100

101101
- name: cleanup opentelemetry-java-contrib
102102
run: rm -rf opentelemetry-java-contrib

.github/workflows/pr-build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ jobs:
129129
if: ${{ matrix.os == 'ubuntu-latest' }}
130130

131131
name: Build with Gradle with Integration tests
132+
if: ${{ matrix.os == 'ubuntu-latest' }}
132133
run: ./gradlew build integrationTests --stacktrace -PenableCoverage=true -PlocalDocker=true
133134

134135
- name: Build and Test UDP exporter
@@ -146,9 +147,9 @@ jobs:
146147

147148
- name: Setup Gradle
148149
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
149-
if: ${{ matrix.os == 'ubuntu-latest' }}
150150

151151
- name: Run contract tests
152+
if: ${{ matrix.os == 'ubuntu-latest' }}
152153
run: ./gradlew contractTests -PlocalDocker=true -i
153154

154155
- name: Set up Java version for image build
@@ -199,9 +200,9 @@ jobs:
199200

200201
- name: Setup Gradle
201202
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a #4.4.3
202-
if: ${{ matrix.os != 'ubuntu-latest' && (hashFiles('.github/patches/opentelemetry-java*.patch') == '' || matrix.os != 'windows-latest' ) }} # build on windows as well unless a patch exists
203203

204204
- name: Build with Gradle
205+
if: ${{ matrix.os != 'ubuntu-latest' && (hashFiles('.github/patches/opentelemetry-java*.patch') == '' || matrix.os != 'windows-latest' ) }} # build on windows as well unless a patch exists
205206
run: ./gradlew build --stacktrace -PenableCoverage=true
206207
- uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 #v5.5.1
207208

0 commit comments

Comments
 (0)