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
a8c113dd62
commit
08ac5d3c4c
|
@ -135,7 +135,10 @@ pipeline {
|
||||||
// update changelog from JIRA
|
// update changelog from JIRA
|
||||||
// tags the version
|
// tags the version
|
||||||
// changes the version to the provided development 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}"
|
sh ".release/scripts/prepare-release.sh ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -161,6 +164,9 @@ 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
|
||||||
|
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}"
|
sh ".release/scripts/publish.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -168,6 +174,7 @@ pipeline {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
stage('Website release') {
|
stage('Website release') {
|
||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
|
|
|
@ -11,7 +11,8 @@
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
isCiEnvironment = isJenkins() || isGitHubActions() || isGenericCi()
|
isCiEnvironment = isJenkins() || isGitHubActions() || isGenericCi()
|
||||||
populateRemoteBuildCache = getSetting( "POPULATE_REMOTE" ).isPresent()
|
populateRemoteBuildCache = isEnabled( "POPULATE_REMOTE" )
|
||||||
|
useRemoteCache = !isEnabled( "DISABLE_REMOTE_GRADLE_CACHE" )
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isJenkins() {
|
private static boolean isJenkins() {
|
||||||
|
@ -36,6 +37,14 @@ static java.util.Optional<String> getSetting(String name) {
|
||||||
return java.util.Optional.ofNullable(sysProp);
|
return java.util.Optional.ofNullable(sysProp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static boolean isEnabled(String setting) {
|
||||||
|
if ( System.getenv().hasProperty( setting ) ) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return System.hasProperty( setting )
|
||||||
|
}
|
||||||
|
|
||||||
gradleEnterprise {
|
gradleEnterprise {
|
||||||
server = 'https://ge.hibernate.org'
|
server = 'https://ge.hibernate.org'
|
||||||
|
|
||||||
|
|
|
@ -279,7 +279,7 @@ buildCache {
|
||||||
enabled = !settings.ext.isCiEnvironment
|
enabled = !settings.ext.isCiEnvironment
|
||||||
}
|
}
|
||||||
remote(HttpBuildCache) {
|
remote(HttpBuildCache) {
|
||||||
enabled = true
|
enabled = settings.ext.useRemoteCache
|
||||||
push = settings.ext.populateRemoteBuildCache
|
push = settings.ext.populateRemoteBuildCache
|
||||||
url = 'https://ge.hibernate.org/cache/'
|
url = 'https://ge.hibernate.org/cache/'
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue