From 9f2a069c188f24bbcc4b276fefa48eb8db54d65a Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Thu, 13 Nov 2025 12:04:51 +0100 Subject: [PATCH 1/2] Add a GitHub release "extra note" template to be included in the GH release template Signed-off-by: marko-bekhta --- github_release_notes.md | 3 +++ jenkins/release/Jenkinsfile | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 github_release_notes.md diff --git a/github_release_notes.md b/github_release_notes.md new file mode 100644 index 000000000..caedf9c03 --- /dev/null +++ b/github_release_notes.md @@ -0,0 +1,3 @@ + +* See the [website](https://hibernate.org/validator/releases/{{releaseVersionFamily}}) for requirements and compatibilities. +* See the [What's New](https://docs.hibernate.org/validator/{{releaseVersionFamily}}/whats-new/en-US/html_single/) guide for details about new features and capabilities. diff --git a/jenkins/release/Jenkinsfile b/jenkins/release/Jenkinsfile index 9f585e9aa..29815f721 100644 --- a/jenkins/release/Jenkinsfile +++ b/jenkins/release/Jenkinsfile @@ -77,8 +77,10 @@ pipeline { dir('.release/scripts') { sh 'git clone --branch test/github-releases https://github.com/hibernate/hibernate-release-scripts.git .' } + def ghReleaseNote = sh('realpath -e github_release_notes.md 2>/dev/null', returnStdout: true).trim() sh """ bash -xe .release/scripts/release.sh -j ${params.RELEASE_DRY_RUN ? '-d' : ''} \ + ${ghReleaseNote != '' ? '--notes=' + ghReleaseNote : ''} \ validator ${releaseVersion.toString()} ${developmentVersion.toString()} """ } From da8a3f5af329b89d5c88d81383565004b46e9249 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Thu, 13 Nov 2025 12:13:55 +0100 Subject: [PATCH 2/2] Use main release scripts version Signed-off-by: marko-bekhta --- jenkins/release/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/release/Jenkinsfile b/jenkins/release/Jenkinsfile index 29815f721..9952c21cd 100644 --- a/jenkins/release/Jenkinsfile +++ b/jenkins/release/Jenkinsfile @@ -75,9 +75,9 @@ pipeline { sshagent(['ed25519.Hibernate-CI.github.com', 'jenkins.in.relation.to', 'hibernate-ci.frs.sourceforge.net']) { sh 'cat $HOME/.ssh/config' dir('.release/scripts') { - sh 'git clone --branch test/github-releases https://github.com/hibernate/hibernate-release-scripts.git .' + sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .' } - def ghReleaseNote = sh('realpath -e github_release_notes.md 2>/dev/null', returnStdout: true).trim() + def ghReleaseNote = sh(script: 'realpath -e github_release_notes.md 2>/dev/null', returnStdout: true).trim() sh """ bash -xe .release/scripts/release.sh -j ${params.RELEASE_DRY_RUN ? '-d' : ''} \ ${ghReleaseNote != '' ? '--notes=' + ghReleaseNote : ''} \