From 499ec9aef1f120c4c60bc809b49135fa9f272e5c Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Sat, 16 Aug 2025 10:45:18 +0200 Subject: [PATCH 1/2] use pinned collector --- .github/workflows/build.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35a8251fa8a..25a24d2598e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,10 +8,9 @@ on: pull_request: workflow_dispatch: -#env: - # uncomment once the collector has been pushed in the daily workflow +env: # renovate: datasource=github-releases depName=opentelemetry-collector packageName=open-telemetry/opentelemetry-collector-releases - # OTEL_COLLECTOR_VERSION: v0.132.2 + OTEL_COLLECTOR_VERSION: v0.132.2 concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} @@ -77,11 +76,11 @@ jobs: uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 - name: Build run: > - ./gradlew build - ${{ matrix.coverage && 'jacocoTestReport' || '' }} - -PtestJavaVersion=${{ matrix.test-java-version }} - "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}" - "-Porg.gradle.java.installations.auto-download=false" + ./gradlew build + ${{ matrix.coverage && 'jacocoTestReport' || '' }} + -PtestJavaVersion=${{ matrix.test-java-version }} + "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}" + "-Porg.gradle.java.installations.auto-download=false" env: # JMH-based tests run only if this environment variable is set to true RUN_JMH_BASED_TESTS: ${{ matrix.jmh-based-tests }} From 00ce8f56133e14cb9aa97e648c7923938aac9bb0 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Sat, 16 Aug 2025 10:45:54 +0200 Subject: [PATCH 2/2] use pinned collector --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25a24d2598e..0fc0ff154f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,11 +76,11 @@ jobs: uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 - name: Build run: > - ./gradlew build - ${{ matrix.coverage && 'jacocoTestReport' || '' }} - -PtestJavaVersion=${{ matrix.test-java-version }} - "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}" - "-Porg.gradle.java.installations.auto-download=false" + ./gradlew build + ${{ matrix.coverage && 'jacocoTestReport' || '' }} + -PtestJavaVersion=${{ matrix.test-java-version }} + "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}" + "-Porg.gradle.java.installations.auto-download=false" env: # JMH-based tests run only if this environment variable is set to true RUN_JMH_BASED_TESTS: ${{ matrix.jmh-based-tests }}