From c436af8b76965f304b523d9c9d81498cbee64d08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2026 20:05:43 +0000 Subject: [PATCH 1/2] build(deps): bump gradle/actions/setup-gradle from 5.0.2 to 6.3.0 Bumps [gradle/actions/setup-gradle](https://github.com/gradle/actions) from 5.0.2 to 6.3.0. - [Release notes](https://github.com/gradle/actions/releases) - [Commits](https://github.com/gradle/actions/compare/0723195856401067f7a2779048b490ace7a47d7c...9c971963bec38e04b3d30dcc455b5382be2fdbfb) --- updated-dependencies: - dependency-name: gradle/actions/setup-gradle dependency-version: 6.3.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 14 +++++++------- .github/workflows/create-releases.yml | 2 +- .github/workflows/examples.yml | 2 +- .github/workflows/runtime-compatibility.yml | 4 ++-- .github/workflows/x509-live-smoke.yml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 342246c25..3ecbfca1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} @@ -102,7 +102,7 @@ jobs: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} @@ -151,7 +151,7 @@ jobs: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} @@ -189,7 +189,7 @@ jobs: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} @@ -235,7 +235,7 @@ jobs: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: cache-read-only: true @@ -291,7 +291,7 @@ jobs: java-version: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} @@ -336,7 +336,7 @@ jobs: java-version: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: cache-read-only: true diff --git a/.github/workflows/create-releases.yml b/.github/workflows/create-releases.yml index 5539c089d..1a396057e 100644 --- a/.github/workflows/create-releases.yml +++ b/.github/workflows/create-releases.yml @@ -285,7 +285,7 @@ jobs: printf 'GRADLE_USER_HOME=%s\n' "$TRUSTED_GRADLE_USER_HOME" >> "$GITHUB_ENV" - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: cache-disabled: true diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 7d33efe63..9314bfe9d 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -36,7 +36,7 @@ jobs: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 - name: Run example env: diff --git a/.github/workflows/runtime-compatibility.yml b/.github/workflows/runtime-compatibility.yml index 83307a12a..e0038daed 100644 --- a/.github/workflows/runtime-compatibility.yml +++ b/.github/workflows/runtime-compatibility.yml @@ -43,7 +43,7 @@ jobs: java-version: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 - name: Read version support policy id: matrix @@ -81,7 +81,7 @@ jobs: java-version: 21 - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 - name: Run consumer compatibility smoke test env: diff --git a/.github/workflows/x509-live-smoke.yml b/.github/workflows/x509-live-smoke.yml index 044637fde..1ce67f561 100644 --- a/.github/workflows/x509-live-smoke.yml +++ b/.github/workflows/x509-live-smoke.yml @@ -89,7 +89,7 @@ jobs: printf 'GRADLE_USER_HOME=%s\n' "$TRUSTED_GRADLE_USER_HOME" >> "$GITHUB_ENV" - name: Set up Gradle - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: cache-disabled: true From 3dce554ebca7d6397309e9c44f8d7b56e93d38fe Mon Sep 17 00:00:00 2001 From: Daniel Piet Date: Wed, 23 Sep 2026 18:59:20 -0400 Subject: [PATCH 2/2] fix(ci): preserve basic caching with setup-gradle v6 --- .github/workflows/ci.yml | 7 +++++++ .github/workflows/create-releases.yml | 1 + .github/workflows/examples.yml | 2 ++ .github/workflows/runtime-compatibility.yml | 4 ++++ .github/workflows/x509-live-smoke.yml | 1 + .../kotlin/com/openai/gradle/GradleCacheTrustPolicyTest.kt | 6 +++--- 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fe8eb570..c90d73623 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,7 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: + cache-provider: basic cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} - name: Verify Maven Central credential transport @@ -109,6 +110,7 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: + cache-provider: basic cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} - name: Build SDK @@ -158,6 +160,7 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: + cache-provider: basic cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} - name: Restore exact-run Gradle build cache @@ -196,6 +199,7 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: + cache-provider: basic cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} - name: Restore exact-run Gradle build cache @@ -242,6 +246,7 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: + cache-provider: basic cache-read-only: true - name: Restore exact-run Gradle build cache @@ -298,6 +303,7 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: + cache-provider: basic cache-read-only: ${{ github.ref_name != github.event.repository.default_branch }} - name: Read version support policy @@ -343,6 +349,7 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: + cache-provider: basic cache-read-only: true - name: Restore exact-run Gradle build cache diff --git a/.github/workflows/create-releases.yml b/.github/workflows/create-releases.yml index f1df2d30a..8c2a03196 100644 --- a/.github/workflows/create-releases.yml +++ b/.github/workflows/create-releases.yml @@ -292,6 +292,7 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: + cache-provider: basic cache-disabled: true - name: Compile the openai-java-core project diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 2bf93199d..b1ed0e816 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -37,6 +37,8 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 + with: + cache-provider: basic - name: Run example env: diff --git a/.github/workflows/runtime-compatibility.yml b/.github/workflows/runtime-compatibility.yml index 89f53a105..98e09de5d 100644 --- a/.github/workflows/runtime-compatibility.yml +++ b/.github/workflows/runtime-compatibility.yml @@ -44,6 +44,8 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 + with: + cache-provider: basic - name: Read version support policy id: matrix @@ -82,6 +84,8 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 + with: + cache-provider: basic - name: Run consumer compatibility smoke test env: diff --git a/.github/workflows/x509-live-smoke.yml b/.github/workflows/x509-live-smoke.yml index a75a4edf8..9bed96f97 100644 --- a/.github/workflows/x509-live-smoke.yml +++ b/.github/workflows/x509-live-smoke.yml @@ -91,6 +91,7 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 with: + cache-provider: basic cache-disabled: true - name: Verify enrolled X.509 identity diff --git a/buildSrc/src/test/kotlin/com/openai/gradle/GradleCacheTrustPolicyTest.kt b/buildSrc/src/test/kotlin/com/openai/gradle/GradleCacheTrustPolicyTest.kt index c61b4f30d..c348aa754 100644 --- a/buildSrc/src/test/kotlin/com/openai/gradle/GradleCacheTrustPolicyTest.kt +++ b/buildSrc/src/test/kotlin/com/openai/gradle/GradleCacheTrustPolicyTest.kt @@ -796,8 +796,8 @@ class GradleCacheTrustPolicyTest { ), workflow.replaceFirst(javaSetup, " cache: gradle\n$javaSetup"), workflow.replaceFirst( - "gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c", - "gradle/actions/setup-gradle@v5", + Regex("gradle/actions/setup-gradle@[0-9a-fA-F]{40}"), + "gradle/actions/setup-gradle@v6", ), ) .forEach { poisonedWorkflow -> @@ -885,7 +885,7 @@ class GradleCacheTrustPolicyTest { mapOf( "actions/checkout" to setOf("persist-credentials", "ref"), "actions/setup-java" to setOf("distribution", "java-version"), - "gradle/actions/setup-gradle" to setOf("cache-disabled"), + "gradle/actions/setup-gradle" to setOf("cache-disabled", "cache-provider"), "graalvm/setup-graalvm" to setOf("distribution", "java-version"), "actions/attest" to setOf("subject-path", "predicate-type", "predicate-path"), )