Skip to content

Commit d628e97

Browse files
committed
Merge remote-tracking branch 'upstream/main' into renovate-custom-manager
2 parents 24a3331 + 32b19aa commit d628e97

10 files changed

+15
-30
lines changed

.github/workflows/build-common.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ jobs:
4444
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
4545
with:
4646
cache-read-only: ${{ inputs.cache-read-only }}
47-
# gradle enterprise is used for the build cache
48-
gradle-home-cache-excludes: caches/build-cache-1
4947

5048
- name: Spotless
5149
run: ./gradlew spotlessCheck ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
@@ -68,8 +66,6 @@ jobs:
6866
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
6967
with:
7068
cache-read-only: ${{ inputs.cache-read-only }}
71-
# gradle enterprise is used for the build cache
72-
gradle-home-cache-excludes: caches/build-cache-1
7369

7470
- name: Generate license report
7571
run: ./gradlew generateLicenseReport ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
@@ -151,8 +147,6 @@ jobs:
151147
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
152148
with:
153149
cache-read-only: ${{ inputs.cache-read-only }}
154-
# gradle enterprise is used for the build cache
155-
gradle-home-cache-excludes: caches/build-cache-1
156150

157151
- name: Build
158152
# javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
@@ -253,8 +247,6 @@ jobs:
253247
with:
254248
# only push cache for one matrix option since github action cache space is limited
255249
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
256-
# gradle enterprise is used for the build cache
257-
gradle-home-cache-excludes: caches/build-cache-1
258250

259251
- name: List tests
260252
# "check" is needed to activate all tests for listing purposes
@@ -379,12 +371,10 @@ jobs:
379371
with:
380372
# only push cache for one matrix option per OS since github action cache space is limited
381373
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
382-
# gradle enterprise is used for the build cache
383-
gradle-home-cache-excludes: caches/build-cache-1
384374

385375
- name: Build
386376
# running suite "none" compiles everything needed by smoke tests without executing any tests
387-
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none --no-daemon ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
377+
run: ./gradlew :smoke-tests:test -PsmokeTestSuite=none ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
388378

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

.github/workflows/build.yml

-3
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ jobs:
7777

7878
- name: Setup Gradle
7979
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
80-
with:
81-
# gradle enterprise is used for the build cache
82-
gradle-home-cache-excludes: caches/build-cache-1
8380

8481
- name: Build and publish artifact snapshots
8582
env:

.github/workflows/codeql.yml

+11-5
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,21 @@ jobs:
3737
- name: Free disk space
3838
run: .github/scripts/gha-free-disk-space.sh
3939

40-
- name: Set up Java 17
40+
- name: Set up JDK for running Gradle
4141
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
4242
with:
4343
distribution: temurin
4444
java-version-file: .java-version
4545

46+
- name: Increase gradle daemon heap size
47+
run: |
48+
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
49+
50+
- name: Setup Gradle
51+
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
52+
with:
53+
cache-read-only: ${{ github.event_name == 'pull_request' }}
54+
4655
- name: Initialize CodeQL
4756
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
4857
with:
@@ -51,12 +60,9 @@ jobs:
5160
# see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
5261
tools: latest
5362

54-
- name: Setup Gradle
55-
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
56-
5763
- name: Build
5864
# skipping build cache is needed so that all modules will be analyzed
59-
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
65+
run: ./gradlew assemble -x javadoc
6066

6167
- name: Perform CodeQL analysis
6268
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8

.github/workflows/pr-smoke-test-early-jdk8-images.yml

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
2929
with:
3030
cache-read-only: true
31-
# gradle enterprise is used for the build cache
32-
gradle-home-cache-excludes: caches/build-cache-1
3331

3432
- name: Build Docker image
3533
run: ./gradlew :smoke-tests:images:early-jdk8:imageBuild

.github/workflows/pr-smoke-test-fake-backend-images.yml

-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
2929
with:
3030
cache-read-only: true
31-
# gradle enterprise is used for the build cache
32-
gradle-home-cache-excludes: caches/build-cache-1
3331

3432
- name: Build Docker image
3533
run: ./gradlew :smoke-tests:images:fake-backend:jibDockerBuild -Djib.httpTimeout=120000 -Djib.console=plain

.github/workflows/publish-petclinic-benchmark-image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Publish PetClinic benchmark image
22
on:
33
push:
44
paths:
5-
- "benchmark-overhead/Dockerfile-petclinic-base"
5+
- "benchmark-overhead/Dockerfile.petclinic"
66
branches:
77
- main
88
workflow_dispatch:
@@ -35,7 +35,7 @@ jobs:
3535
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
3636
with:
3737
push: true
38-
file: benchmark-overhead/Dockerfile-petclinic-base
38+
file: benchmark-overhead/Dockerfile.petclinic
3939
tags: ghcr.io/open-telemetry/opentelemetry-java-instrumentation/petclinic-rest-base:${{ env.TS }}
4040

4141
workflow-notification:

.github/workflows/reusable-test-indy.yml

-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ jobs:
6464
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
6565
with:
6666
cache-read-only: ${{ inputs.cache-read-only }}
67-
# gradle enterprise is used for the build cache
68-
gradle-home-cache-excludes: caches/build-cache-1
6967

7068
- name: List tests
7169
run: >

.github/workflows/reusable-test-latest-deps.yml

-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ jobs:
6161
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
6262
with:
6363
cache-read-only: ${{ inputs.cache-read-only }}
64-
# gradle enterprise is used for the build cache
65-
gradle-home-cache-excludes: caches/build-cache-1
6664

6765
- name: List tests
6866
run: >

test-report/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
dependencies {
66
implementation("com.google.api-client:google-api-client:2.7.2")
77
implementation("com.google.apis:google-api-services-sheets:v4-rev20250106-2.0.0")
8-
implementation("com.google.auth:google-auth-library-oauth2-http:1.31.0")
8+
implementation("com.google.auth:google-auth-library-oauth2-http:1.32.0")
99
}
1010

1111
otelJava {

0 commit comments

Comments
 (0)