From 2d526c63a7a4e723f4b59ce4f50483b4808b2a56 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Tue, 8 Apr 2025 11:07:51 +0200 Subject: [PATCH] Test the ci-commiter before checking the release type (manual/automatic) --- ci/release/Jenkinsfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index ac17cd7df685..b09bd1ae55e8 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -116,6 +116,13 @@ pipeline { def releaseVersion def developmentVersion + def lastCommitter = sh(script: 'git show -s --format=\'%an\'', returnStdout: true).trim() + def secondLastCommitter = sh(script: 'git show -s --format=\'%an\' HEAD~1', returnStdout: true).trim() + def isCiLastCommiter = lastCommitter == 'Hibernate-CI' && secondLastCommitter == 'Hibernate-CI' + + echo "Last two commits were performed by '${lastCommitter}'/'${secondLastCommitter}'." + echo "Is 'Hibernate-CI' the last commiter: '${isCiLastCommiter}'." + if ( manualRelease ) { echo "Release was requested manually" @@ -134,9 +141,8 @@ pipeline { echo "Release was triggered automatically" // Avoid doing an automatic release for commits from a release - def lastCommitter = sh(script: 'git show -s --format=\'%an\'', returnStdout: true) - def secondLastCommitter = sh(script: 'git show -s --format=\'%an\' HEAD~1', returnStdout: true) - if (lastCommitter == 'Hibernate-CI' && secondLastCommitter == 'Hibernate-CI') { + + if (isCiLastCommiter) { print "INFO: Automatic release skipped because last commits were for the previous release" currentBuild.getRawBuild().getExecutor().interrupt(Result.NOT_BUILT) sleep(1) // Interrupt is not blocking and does not take effect immediately.