diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index 026237cec8..6b6ca9089f 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -135,7 +135,10 @@ pipeline { // update changelog from JIRA // tags the version // changes the version to the provided development version - withEnv(["BRANCH=${env.GIT_BRANCH}"]) { + withEnv([ + "BRANCH=${env.GIT_BRANCH}", + "DISABLE_REMOTE_GRADLE_CACHE=true" + ]) { sh ".release/scripts/prepare-release.sh ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION}" } } @@ -161,7 +164,11 @@ pipeline { sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) { // performs documentation upload and Sonatype release // push to github - sh ".release/scripts/publish.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH}" + withEnv([ + "DISABLE_REMOTE_GRADLE_CACHE=true" + ]) { + sh ".release/scripts/publish.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH}" + } } } } diff --git a/gradle/gradle-enterprise.gradle b/gradle/gradle-enterprise.gradle index 700b0618af..107b4d22fd 100644 --- a/gradle/gradle-enterprise.gradle +++ b/gradle/gradle-enterprise.gradle @@ -11,7 +11,8 @@ ext { isCiEnvironment = isJenkins() || isGitHubActions() || isGenericCi() - populateRemoteBuildCache = getSetting( "POPULATE_REMOTE" ).isPresent() + populateRemoteBuildCache = isEnabled( "POPULATE_REMOTE" ) + useRemoteCache = !isEnabled( "DISABLE_REMOTE_GRADLE_CACHE" ) } private static boolean isJenkins() { @@ -36,6 +37,14 @@ static java.util.Optional getSetting(String name) { return java.util.Optional.ofNullable(sysProp); } +static boolean isEnabled(String setting) { + if ( System.getenv().hasProperty( setting ) ) { + return true + } + + return System.hasProperty( setting ) +} + gradleEnterprise { server = 'https://ge.hibernate.org' diff --git a/settings.gradle b/settings.gradle index 4675fded28..0028111bb1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -279,7 +279,7 @@ buildCache { enabled = !settings.ext.isCiEnvironment } remote(HttpBuildCache) { - enabled = true + enabled = settings.ext.useRemoteCache push = settings.ext.populateRemoteBuildCache url = 'https://ge.hibernate.org/cache/' }