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.
This commit is contained in:
parent
df8b16369f
commit
543e095cf7
|
@ -176,6 +176,7 @@ pipeline {
|
||||||
// changes the version to the provided development version
|
// changes the version to the provided development version
|
||||||
withEnv([
|
withEnv([
|
||||||
"BRANCH=${env.GIT_BRANCH}",
|
"BRANCH=${env.GIT_BRANCH}",
|
||||||
|
"DISABLE_REMOTE_GRADLE_CACHE=true",
|
||||||
// Increase the amount of memory for this part since asciidoctor doc rendering consumes a lot of metaspace
|
// Increase the amount of memory for this part since asciidoctor doc rendering consumes a lot of metaspace
|
||||||
"GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'"
|
"GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'"
|
||||||
]) {
|
]) {
|
||||||
|
@ -206,7 +207,11 @@ pipeline {
|
||||||
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
|
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
|
||||||
// performs documentation upload and Sonatype release
|
// performs documentation upload and Sonatype release
|
||||||
// push to github
|
// 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'),
|
string(credentialsId: 'release.gpg.passphrase', variable: 'SIGNING_PASS'),
|
||||||
file(credentialsId: 'release.gpg.private-key', variable: 'SIGNING_KEYRING')
|
file(credentialsId: 'release.gpg.private-key', variable: 'SIGNING_KEYRING')
|
||||||
]) {
|
]) {
|
||||||
sh '''./gradlew clean publish \
|
withEnv([
|
||||||
-PhibernatePublishUsername=$hibernatePublishUsername \
|
"DISABLE_REMOTE_GRADLE_CACHE=true"
|
||||||
-PhibernatePublishPassword=$hibernatePublishPassword \
|
]) {
|
||||||
-Pgradle.publish.key=$hibernatePluginPortalUsername \
|
sh '''./gradlew clean publish \
|
||||||
-Pgradle.publish.secret=$hibernatePluginPortalPassword \
|
-PhibernatePublishUsername=$hibernatePublishUsername \
|
||||||
--no-scan \
|
-PhibernatePublishPassword=$hibernatePublishPassword \
|
||||||
-DsigningPassword=$SIGNING_PASS \
|
-Pgradle.publish.key=$hibernatePluginPortalUsername \
|
||||||
-DsigningKeyFile=$SIGNING_KEYRING \
|
-Pgradle.publish.secret=$hibernatePluginPortalPassword \
|
||||||
'''
|
--no-scan \
|
||||||
|
--no-build-cache \
|
||||||
|
-DsigningPassword=$SIGNING_PASS \
|
||||||
|
-DsigningKeyFile=$SIGNING_KEYRING \
|
||||||
|
'''
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
ext {
|
ext {
|
||||||
isCiEnvironment = isJenkins() || isGitHubActions() || isGenericCi()
|
isCiEnvironment = isJenkins() || isGitHubActions() || isGenericCi()
|
||||||
populateRemoteBuildCache = isEnabled( "POPULATE_REMOTE_GRADLE_CACHE" )
|
populateRemoteBuildCache = isEnabled( "POPULATE_REMOTE_GRADLE_CACHE" )
|
||||||
|
useRemoteCache = !isEnabled( "DISABLE_REMOTE_GRADLE_CACHE" )
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isJenkins() {
|
private static boolean isJenkins() {
|
||||||
|
|
|
@ -306,7 +306,7 @@ buildCache {
|
||||||
enabled = !settings.ext.isCiEnvironment
|
enabled = !settings.ext.isCiEnvironment
|
||||||
}
|
}
|
||||||
remote(develocity.buildCache) {
|
remote(develocity.buildCache) {
|
||||||
enabled = true
|
enabled = settings.ext.useRemoteCache
|
||||||
// Check access key presence to avoid build cache errors on PR builds when access key is not present
|
// Check access key presence to avoid build cache errors on PR builds when access key is not present
|
||||||
def accessKey = System.getenv("DEVELOCITY_ACCESS_KEY")
|
def accessKey = System.getenv("DEVELOCITY_ACCESS_KEY")
|
||||||
push = settings.ext.populateRemoteBuildCache && accessKey
|
push = settings.ext.populateRemoteBuildCache && accessKey
|
||||||
|
|
Loading…
Reference in New Issue