Don't use the build cache during releases
So that we're extra sure we're not relying on cache left by a previous
Gradle execution.
(cherry picked from commit 543e095cf7
)
This commit is contained in:
parent
222b1a2b26
commit
6fcb0d50fb
|
@ -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}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,15 +37,20 @@ pipeline {
|
|||
string(credentialsId: 'release.gpg.passphrase', variable: 'SIGNING_PASS'),
|
||||
file(credentialsId: 'release.gpg.private-key', variable: 'SIGNING_KEYRING')
|
||||
]) {
|
||||
sh '''./gradlew clean publish \
|
||||
-PhibernatePublishUsername=$hibernatePublishUsername \
|
||||
-PhibernatePublishPassword=$hibernatePublishPassword \
|
||||
-Pgradle.publish.key=$hibernatePluginPortalUsername \
|
||||
-Pgradle.publish.secret=$hibernatePluginPortalPassword \
|
||||
--no-scan \
|
||||
-DsigningPassword=$SIGNING_PASS \
|
||||
-DsigningKeyFile=$SIGNING_KEYRING \
|
||||
'''
|
||||
withEnv([
|
||||
"DISABLE_REMOTE_GRADLE_CACHE=true"
|
||||
]) {
|
||||
sh '''./gradlew clean publish \
|
||||
-PhibernatePublishUsername=$hibernatePublishUsername \
|
||||
-PhibernatePublishPassword=$hibernatePublishPassword \
|
||||
-Pgradle.publish.key=$hibernatePluginPortalUsername \
|
||||
-Pgradle.publish.secret=$hibernatePluginPortalPassword \
|
||||
--no-scan \
|
||||
--no-build-cache \
|
||||
-DsigningPassword=$SIGNING_PASS \
|
||||
-DsigningKeyFile=$SIGNING_KEYRING \
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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<String> 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'
|
||||
|
||||
|
|
|
@ -287,7 +287,7 @@ buildCache {
|
|||
enabled = !settings.ext.isCiEnvironment
|
||||
}
|
||||
remote(HttpBuildCache) {
|
||||
enabled = true
|
||||
enabled = settings.ext.useRemoteCache
|
||||
// Check access key presence to avoid build cache errors on PR builds when access key is not present
|
||||
def accessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY")
|
||||
push = settings.ext.populateRemoteBuildCache && accessKey
|
||||
|
|
Loading…
Reference in New Issue