Skip to content

Commit

Permalink
Fix benchmark-overhead compilation (open-telemetry#13418)
Browse files Browse the repository at this point in the history
  • Loading branch information
trask authored and chlos committed Mar 3, 2025
1 parent 8c1e4f2 commit ffd0b1a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/build-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ jobs:
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}

- name: Test
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}

- name: Upload jvm crash dump files if any
if: failure()
Expand Down Expand Up @@ -489,13 +489,17 @@ jobs:
working-directory: gradle-plugins

- name: Build distro
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
working-directory: examples/distro

- name: Build extension
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
working-directory: examples/extension

- name: Build benchmark-overhead
run: ./gradlew assemble ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
working-directory: benchmark-overhead

- name: Run muzzle check against extension
run: ./gradlew muzzle --init-script ../../.github/scripts/local.init.gradle.kts
working-directory: examples/extension
5 changes: 1 addition & 4 deletions benchmark-overhead/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,11 @@ dependencies {
testImplementation("org.slf4j:slf4j-simple:2.0.17")

testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

tasks {
test {
useJUnitPlatform()
testLogging {
exceptionFormat = TestExceptionFormat.FULL
showStandardStreams = true
}
}
}

0 comments on commit ffd0b1a

Please sign in to comment.