Skip to content

Commit e46ba4e

Browse files
committed
Adjust the release process
1 parent 4be8060 commit e46ba4e

File tree

3 files changed

+10
-43
lines changed

3 files changed

+10
-43
lines changed

.release/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# The folder into which we checkout our release scripts into
2+
*
3+
!.gitignore

ci/release/Jenkinsfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ pipeline {
4747

4848
def releaseVersion = Version.parseReleaseVersion(params.RELEASE_VERSION)
4949
def developmentVersion = Version.parseDevelopmentVersion(params.DEVELOPMENT_VERSION)
50+
env.JRELEASER_DRY_RUN = params.RELEASE_DRY_RUN
5051
echo "Performing full release for version ${releaseVersion.toString()}"
5152

52-
withMaven(mavenSettingsConfig: null, mavenLocalRepo: env.WORKSPACE_TMP + '/.m2repository') {
53+
withMaven(mavenSettingsConfig: params.RELEASE_DRY_RUN ? null : 'ci-hibernate.deploy.settings.maven',
54+
mavenLocalRepo: env.WORKSPACE_TMP + '/.m2repository') {
5355
configFileProvider([configFile(fileId: 'release.config.ssh', targetLocation: env.HOME + '/.ssh/config'),
5456
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: env.HOME + '/.ssh/known_hosts')]) {
5557
withCredentials([// TODO: Once we switch to maven-central publishing (from nexus2) we need to add a new credentials
@@ -65,10 +67,11 @@ pipeline {
6567
sshagent(['ed25519.Hibernate-CI.github.com']) {
6668
sh 'mvn -v'
6769
sh 'cat $HOME/.ssh/config'
68-
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git'
69-
env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg'
70+
dir('.release/scripts') {
71+
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .'
72+
}
7073
sh """
71-
bash -xe hibernate-release-scripts/release.sh ${params.RELEASE_DRY_RUN ? '-d' : ''} \
74+
bash -xe .release/scripts/release.sh -j ${params.RELEASE_DRY_RUN ? '-d' : ''} \
7275
infra-extensions ${releaseVersion.toString()} ${developmentVersion.toString()}
7376
"""
7477
}

jreleaser.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)