From 8c26b72839b078e787d994b8e6d66bdcb2708eab Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Thu, 29 Feb 2024 11:01:45 +0000 Subject: [PATCH] refactor: Upgrade Develocity Use this link to re-run the recipe: https://app.moderne.io/recipes/builder/Zb7BQc324?organizationId=NTUyM2Y5NWYtN2RjMC00Y2FiLWJmMmYtMmY2MmMzNjU1OWQz Co-authored-by: Moderne --- .github/workflows/ci.yml | 2 -- settings.gradle.kts | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 011eec1..379e49f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,6 @@ jobs: uses: openrewrite/gh-automation/.github/workflows/ci-gradle.yml@main secrets: gradle_enterprise_access_key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} - gradle_enterprise_cache_username: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }} - gradle_enterprise_cache_password: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} ossrh_username: ${{ secrets.OSSRH_USERNAME }} ossrh_token: ${{ secrets.OSSRH_TOKEN }} ossrh_signing_key: ${{ secrets.OSSRH_SIGNING_KEY }} diff --git a/settings.gradle.kts b/settings.gradle.kts index 09b052f..3d14678 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,7 @@ rootProject.name = "rewrite-micrometer" plugins { - id("com.gradle.enterprise") version "3.16" + id("com.gradle.enterprise") version "latest.release" id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.1" } @@ -10,11 +10,10 @@ gradleEnterprise { server = "https://ge.openrewrite.org/" buildCache { - remote(HttpBuildCache::class) { - url = uri("https://ge.openrewrite.org/cache/") - // Check access key presence to avoid build cache errors on PR builds when access key is not present + remote(gradleEnterprise.buildCache) { + isEnabled = true val accessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") - isPush = isCiServer && !accessKey.isNullOrEmpty() + isPush = isCiServer && !accessKey.isNullOrBlank() } }