Skip to content

Commit 66e43cc

Browse files
Update gradle/actions action to v4 (#1401)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb <[email protected]>
1 parent dcfdebe commit 66e43cc

File tree

6 files changed

+56
-52
lines changed

6 files changed

+56
-52
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#
22
# Learn about membership in OpenTelemetry community:
3-
# https://github.com/open-telemetry/community/blob/main/community-membership.md
4-
#
3+
# https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md
54
#
6-
# Learn about CODEOWNERS file format:
5+
#
6+
# Learn about CODEOWNERS file format:
77
# https://help.github.com/en/articles/about-code-owners
88
#
99

.github/workflows/build.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ jobs:
2424
distribution: temurin
2525
java-version: 17
2626

27-
- name: Build
28-
uses: gradle/actions/setup-gradle@v3
27+
- name: Set up gradle
28+
uses: gradle/actions/setup-gradle@v4
2929
with:
30-
arguments: build -x test
3130
cache-read-only: ${{ github.event_name == 'pull_request' }}
31+
- name: Gradle build and test
32+
run: ./gradlew build -x test
3233
env:
3334
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3435

@@ -60,15 +61,16 @@ jobs:
6061
distribution: temurin
6162
java-version: 17
6263

63-
- name: Build
64-
uses: gradle/actions/setup-gradle@v3
64+
- name: Set up gradle
65+
uses: gradle/actions/setup-gradle@v4
6566
with:
66-
arguments: >
67-
test
68-
-PtestJavaVersion=${{ matrix.test-java-version }}
69-
-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
70-
-Porg.gradle.java.installations.auto-download=false
7167
cache-read-only: ${{ github.event_name == 'pull_request' }}
68+
- name: Gradle test
69+
run: >
70+
./gradlew test
71+
-PtestJavaVersion=${{ matrix.test-java-version }}
72+
-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
73+
-Porg.gradle.java.installations.auto-download=false
7274
env:
7375
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
7476

@@ -83,11 +85,12 @@ jobs:
8385
distribution: temurin
8486
java-version: 17
8587

86-
- name: Integration test
87-
uses: gradle/actions/setup-gradle@v3
88+
- name: Set up gradle
89+
uses: gradle/actions/setup-gradle@v4
8890
with:
89-
arguments: integrationTest
9091
cache-read-only: ${{ github.event_name == 'pull_request' }}
92+
- name: Integration test
93+
run: ./gradlew integrationTest
9194
env:
9295
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
9396

@@ -135,13 +138,14 @@ jobs:
135138
distribution: temurin
136139
java-version: 17
137140

138-
- name: Build and publish snapshots
139-
uses: gradle/actions/setup-gradle@v3
141+
- name: Set up gradle
142+
uses: gradle/actions/setup-gradle@v4
140143
# skipping release branches because the versions in those branches are not snapshots
141144
# (also this skips pull requests)
142145
if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-contrib' }}
143-
with:
144-
arguments: assemble publishToSonatype
146+
- name: Build and publish snapshots
147+
if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-contrib' }}
148+
run: ./gradlew assemble publishToSonatype
145149
env:
146150
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
147151
SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}

.github/workflows/codeql-daily.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ jobs:
2727
# see https://github.com/github/codeql-action/issues/1555#issuecomment-1452228433
2828
tools: latest
2929

30-
- uses: gradle/actions/setup-gradle@v3
31-
with:
30+
- name: Set up gradle
31+
uses: gradle/actions/setup-gradle@v4
32+
- name: Gradle assemble
3233
# skipping build cache is needed so that all modules will be analyzed
33-
arguments: assemble --no-build-cache
34+
run: ./gradlew assemble --no-build-cache
3435

3536
- name: Perform CodeQL analysis
3637
uses: github/codeql-action/analyze@v3

.github/workflows/release.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
distribution: temurin
1515
java-version: 17
1616

17-
- uses: gradle/actions/setup-gradle@v3
18-
name: Build
19-
with:
20-
arguments: build
17+
- name: Set up gradle
18+
uses: gradle/actions/setup-gradle@v4
19+
- name: Gradle build
20+
run: ./gradlew build
2121

2222
- uses: actions/upload-artifact@v4
2323
name: Save unit test results
@@ -37,10 +37,10 @@ jobs:
3737
distribution: temurin
3838
java-version: 17
3939

40-
- uses: gradle/actions/setup-gradle@v3
41-
name: Integration test
42-
with:
43-
arguments: integrationTest
40+
- name: Set up gradle
41+
uses: gradle/actions/setup-gradle@v4
42+
- name: Integration test
43+
run: ./gradlew integrationTest
4444

4545
- uses: actions/upload-artifact@v4
4646
name: Save integration test results
@@ -118,10 +118,10 @@ jobs:
118118
distribution: temurin
119119
java-version: 17
120120

121+
- name: Set up gradle
122+
uses: gradle/actions/setup-gradle@v4
121123
- name: Build and publish artifacts
122-
uses: gradle/actions/setup-gradle@v3
123-
with:
124-
arguments: assemble publishToSonatype closeAndReleaseSonatypeStagingRepository
124+
run: ./gradlew assemble publishToSonatype closeAndReleaseSonatypeStagingRepository
125125
env:
126126
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
127127
SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Emeritus maintainers:
7272
- [Nikita Salnikov-Tarnovski](https://github.com/iNikem), Splunk
7373
- [Ryan Fitzpatrick](https://github.com/rmfitzpatrick), Splunk
7474

75-
Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md).
75+
Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md).
7676

7777
Thanks to all the people who already contributed!
7878

settings.gradle.kts

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
pluginManagement {
22
plugins {
33
id("com.github.johnrengelman.shadow") version "8.1.1"
4-
id("com.gradle.enterprise") version "3.17.6"
4+
id("com.gradle.develocity") version "3.17.6"
55
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
66
}
77
}
88

99
plugins {
10-
id("com.gradle.enterprise")
10+
id("com.gradle.develocity")
1111
}
1212

1313
dependencyResolutionManagement {
@@ -18,36 +18,35 @@ dependencyResolutionManagement {
1818

1919
val gradleEnterpriseServer = "https://ge.opentelemetry.io"
2020
val isCI = System.getenv("CI") != null
21-
val geAccessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") ?: ""
21+
val develocityAccessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") ?: ""
2222

2323
// if GE access key is not given and we are in CI, then we publish to scans.gradle.com
24-
val useScansGradleCom = isCI && geAccessKey.isEmpty()
24+
val useScansGradleCom = isCI && develocityAccessKey.isEmpty()
2525

2626
if (useScansGradleCom) {
27-
gradleEnterprise {
27+
develocity {
2828
buildScan {
29-
termsOfServiceUrl = "https://gradle.com/terms-of-service"
30-
termsOfServiceAgree = "yes"
31-
isUploadInBackground = !isCI
32-
publishAlways()
29+
termsOfUseUrl.set("https://gradle.com/terms-of-service")
30+
termsOfUseAgree.set("yes")
31+
uploadInBackground.set(!isCI)
32+
publishing.onlyIf { true }
3333

3434
capture {
35-
isTaskInputFiles = true
35+
fileFingerprints.set(true)
3636
}
3737
}
3838
}
3939
} else {
40-
gradleEnterprise {
40+
develocity {
4141
server = gradleEnterpriseServer
4242
buildScan {
43-
isUploadInBackground = !isCI
44-
45-
this as com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
46-
publishIfAuthenticated()
47-
publishAlways()
43+
uploadInBackground.set(!isCI)
4844

45+
publishing.onlyIf {
46+
it.isAuthenticated
47+
}
4948
capture {
50-
isTaskInputFiles = true
49+
fileFingerprints.set(true)
5150
}
5251

5352
gradle.startParameter.projectProperties["testJavaVersion"]?.let { tag(it) }

0 commit comments

Comments
 (0)