Skip to content

Commit 365e471

Browse files
martinbonninmartinbonnin
authored
[infra] Update to develocity API (#5967)
* Update to develocity API * update env variable * add debug * update GitHub actions * remove debug
1 parent 720d01d commit 365e471

File tree

9 files changed

+51
-50
lines changed

9 files changed

+51
-50
lines changed

‎.github/workflows/benchmarks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
11+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1212

1313
jobs:
1414
benchmarks:
1515
runs-on: macos-14
1616
if: github.repository == 'apollographql/apollo-kotlin'
1717
steps:
18-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
19-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
18+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
19+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
2020
with:
2121
distribution: 'temurin'
2222
java-version: 17
23-
- uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
23+
- uses: gradle/gradle-build-action@db35f2304698ac6ff98958322dfd3db0a5da9fdf #v3.4.0
2424
with:
2525
gradle-home-cache-cleanup: true
2626
- run: |

‎.github/workflows/defer-with-router-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ on:
44
schedule:
55
- cron: '0 3 * * *'
66
env:
7-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
7+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
88

99
jobs:
1010
defer-with-router-tests:
1111
runs-on: ubuntu-latest
1212
if: github.repository == 'apollographql/apollo-kotlin'
1313
steps:
1414
- name: Checkout project
15-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
15+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
1616

1717
- name: Install and run subgraph
1818
working-directory: tests/defer/router/subgraphs/computers
@@ -29,13 +29,13 @@ jobs:
2929
./router --supergraph tests/defer/router/simple-supergraph.graphqls &
3030
3131
- name: Setup Java
32-
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
32+
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
3333
with:
3434
distribution: 'temurin'
3535
java-version: 17
3636

3737
- name: Setup Gradle
38-
uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
38+
uses: gradle/gradle-build-action@db35f2304698ac6ff98958322dfd3db0a5da9fdf #v3.4.0
3939

4040
- name: Run Apollo Kotlin @defer tests
4141
env:

‎.github/workflows/platform-api-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
11+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1212

1313
jobs:
1414
platform-api-tests:
1515
runs-on: macos-14
1616
if: github.repository == 'apollographql/apollo-kotlin'
1717
steps:
1818
- name: Checkout project
19-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
19+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
2020

2121
- name: Setup Java
22-
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
22+
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
2323
with:
2424
distribution: 'temurin'
2525
java-version: 17
2626

2727
- name: Setup Gradle
28-
uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
28+
uses: gradle/gradle-build-action@db35f2304698ac6ff98958322dfd3db0a5da9fdf #v3.4.0
2929

3030
- name: Run tests against the Apollo Platform API
3131
env:

‎.github/workflows/pr.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'docs/**'
77
- '*.md'
88
env:
9-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
9+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1010

1111
# Cancel any current or previous job from the same PR
1212
concurrency:
@@ -18,12 +18,12 @@ jobs:
1818
if: "!startsWith(github.head_ref, 'release-')"
1919
runs-on: macos-14
2020
steps:
21-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
22-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
21+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
22+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
2323
with:
2424
distribution: 'temurin'
2525
java-version: 17
26-
- uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
26+
- uses: gradle/gradle-build-action@db35f2304698ac6ff98958322dfd3db0a5da9fdf #v3.4.0
2727
with:
2828
gradle-home-cache-cleanup: true
2929
- name: Build with Gradle
@@ -32,7 +32,7 @@ jobs:
3232
- name: Collect Diagnostics
3333
if: always()
3434
run: ./scripts/collect-diagnostics.main.kts
35-
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
35+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
3636
if: always()
3737
with:
3838
name: tests-gradle.zip
@@ -42,12 +42,12 @@ jobs:
4242
if: "!startsWith(github.head_ref, 'release-')"
4343
runs-on: macos-14
4444
steps:
45-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
46-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
45+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
46+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
4747
with:
4848
distribution: 'temurin'
4949
java-version: 17
50-
- uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
50+
- uses: gradle/gradle-build-action@db35f2304698ac6ff98958322dfd3db0a5da9fdf #v3.4.0
5151
with:
5252
gradle-home-cache-cleanup: true
5353
- name: Build with Gradle
@@ -56,7 +56,7 @@ jobs:
5656
- name: Collect Diagnostics
5757
if: always()
5858
run: ./scripts/collect-diagnostics.main.kts
59-
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
59+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
6060
if: always()
6161
with:
6262
name: tests-no-gradle.zip
@@ -66,12 +66,12 @@ jobs:
6666
if: "!startsWith(github.head_ref, 'release-')"
6767
runs-on: macos-14
6868
steps:
69-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
70-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
69+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
70+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
7171
with:
7272
distribution: 'temurin'
7373
java-version: 17
74-
- uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
74+
- uses: gradle/gradle-build-action@db35f2304698ac6ff98958322dfd3db0a5da9fdf #v3.4.0
7575
with:
7676
gradle-home-cache-cleanup: true
7777
- name: Build with Gradle
@@ -80,7 +80,7 @@ jobs:
8080
- name: Collect Diagnostics
8181
if: always()
8282
run: ./scripts/collect-diagnostics.main.kts
83-
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
83+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
8484
if: always()
8585
with:
8686
name: tests-integration.zip
@@ -102,11 +102,11 @@ jobs:
102102
103103
# Check out current repository
104104
- name: Fetch Sources
105-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
105+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
106106

107107
# Setup Java 11 environment for the next steps
108108
- name: Setup Java
109-
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
109+
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
110110
with:
111111
distribution: 'temurin'
112112
java-version: 17
@@ -136,14 +136,14 @@ jobs:
136136
# Collect Tests Result of failed tests
137137
- name: Collect Tests Result
138138
if: ${{ failure() }}
139-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
139+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
140140
with:
141141
name: tests-result
142142
path: ${{ github.workspace }}/intellij-plugin/build/reports/tests
143143

144144
# Cache Plugin Verifier IDEs
145145
- name: Setup Plugin Verifier IDEs Cache
146-
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 #v4.0.0
146+
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
147147
with:
148148
path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
149149
key: plugin-verifier-${{ hashFiles('intellij-plugin/build/listProductsReleases.txt') }}
@@ -155,7 +155,7 @@ jobs:
155155
# Collect Plugin Verifier Result
156156
- name: Collect Plugin Verifier Result
157157
if: ${{ always() }}
158-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
158+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
159159
with:
160160
name: pluginVerifier-result
161161
path: ${{ github.workspace }}/intellij-plugin/build/reports/pluginVerifier
@@ -173,7 +173,7 @@ jobs:
173173
174174
# Store already-built plugin as an artifact for downloading
175175
- name: Upload artifact
176-
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
176+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
177177
with:
178178
name: ${{ steps.artifact.outputs.filename }}
179179
path: ./intellij-plugin/build/distributions/content/*/*

‎.github/workflows/publish-ij-plugin-snapshot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ on:
55
- cron: '0 0 * * 0'
66
workflow_dispatch:
77
env:
8-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
8+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
99

1010
jobs:
1111
publish-intellij-plugin:
1212
name: Publish IntelliJ plugin
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
15+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
1616

17-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
17+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
1818
with:
1919
distribution: 'temurin'
2020
java-version: 17

‎.github/workflows/push.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ on:
77
- 'docs/**'
88
- '*.md'
99
env:
10-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
10+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
1111

1212
jobs:
1313
deploy:
1414
runs-on: macos-14
1515
if: github.repository == 'apollographql/apollo-kotlin'
1616
steps:
17-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
18-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
17+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
18+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
1919
with:
2020
distribution: 'temurin'
2121
java-version: 17
22-
- uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
22+
- uses: gradle/gradle-build-action@db35f2304698ac6ff98958322dfd3db0a5da9fdf #v3.4.0
2323
with:
2424
gradle-home-cache-cleanup: true
2525
- name: Build with Gradle
@@ -35,13 +35,13 @@ jobs:
3535
- name: Collect Diagnostics
3636
if: always()
3737
run: ./scripts/collect-diagnostics.main.kts
38-
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
38+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #v4.3.3
3939
if: always()
4040
with:
4141
name: push.zip
4242
path: diagnostics.zip
4343
- name: Deploy Kdoc to github pages
44-
uses: JamesIves/github-pages-deploy-action@65b5dfd4f5bcd3a7403bbc2959c144256167464e #v4.5.0
44+
uses: JamesIves/github-pages-deploy-action@5c6e9e9f3672ce8fd37b9856193d2a537941e66c #v4.6.1
4545
with:
4646
branch: gh-pages # The branch the action should deploy to.
4747
folder: libraries/apollo-kdoc/build/dokka/html # The folder the action should deploy.

‎.github/workflows/tag.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ on:
55
tags:
66
- '*'
77
env:
8-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
8+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
99

1010
jobs:
1111
publish-libraries:
1212
name: Publish libraries
1313
runs-on: macos-14
1414
if: github.repository == 'apollographql/apollo-kotlin'
1515
steps:
16-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
17-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
16+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
17+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
1818
with:
1919
distribution: 'temurin'
2020
java-version: 17
21-
- uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
21+
- uses: gradle/gradle-build-action@db35f2304698ac6ff98958322dfd3db0a5da9fdf #v3.4.0
2222
with:
2323
gradle-home-cache-cleanup: true
2424
#--no-configuration-cache for https://youtrack.jetbrains.com/issue/KT-65879
@@ -36,8 +36,8 @@ jobs:
3636
name: Publish IntelliJ plugin
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
40-
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
39+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
40+
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
4141
with:
4242
distribution: 'temurin'
4343
java-version: 17

‎build-logic/src/main/kotlin/Testing.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import com.gradle.enterprise.gradleplugin.testretry.retry
1+
import com.gradle.develocity.agent.gradle.test.DevelocityTestConfiguration
22
import org.gradle.api.Project
33
import org.gradle.api.tasks.PathSensitivity
44
import org.gradle.api.tasks.testing.AbstractTestTask
@@ -14,10 +14,10 @@ fun Project.configureTesting() {
1414
forwardEnv("testFilter")
1515
forwardEnv("codegenModels")
1616
}
17-
17+
1818
pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
1919
tasks.withType(Test::class.java) {
20-
retry {
20+
extensions.getByType(DevelocityTestConfiguration::class.java).testRetry {
2121
if (isCIBuild()) {
2222
maxRetries.set(3)
2323
failOnPassedAfterRetry.set(true)
@@ -54,6 +54,7 @@ private fun Project.addTestDependencies() {
5454
}
5555
}
5656
}
57+
5758
is KotlinJvmProjectExtension -> {
5859
dependencies.add("testImplementation", getCatalogLib("kotlin.test"))
5960
}

‎gradle/ge.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ buildCache {
2525
remote(develocity.buildCache) {
2626
enabled = true
2727
// Check access key presence to avoid build cache errors on PR builds when access key is not present
28-
def accessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY")
28+
def accessKey = System.getenv("DEVELOCITY_ACCESS_KEY")
2929
push = isCI && accessKey
3030
}
3131
}

0 commit comments

Comments
 (0)