diff --git a/Jenkinsfile b/Jenkinsfile index e43c086..4871e36 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -85,7 +85,6 @@ pipeline { script { if (env.CHANGE_BRANCH?.startsWith('rc')) { echo "Attempting to merge PR ${env.CHANGE_ID} into master..." - def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim() // def mergeCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim() withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) { def prId = env.CHANGE_ID @@ -98,7 +97,7 @@ pipeline { http://git.entcor/api/v1/repos/deployer3000/${env.IMAGE_NAME}/pulls/${prId}/merge """ echo "PR ${prId} merged successfully into main!" - + def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim() echo "Merge commit hash: ${mergeCommitHash}" sh """ curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \