Jenkinsfile

@@ -82,13 +82,12 @@ 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()
                     withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) {
                         def prId = env.CHANGE_ID
                         sh """
                             curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \
                             -H "Content-Type: application/json" \
-                            -d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${commitHash}"}' \
+                            -d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${env.GIT_COMMIT}"}' \
                             "${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases"
                         """
                         echo "New release succeeded!"
@@ -102,6 +101,7 @@ pipeline {
                         """
                         echo "PR ${prId} merged successfully into main!"
                         def context = "test-org/${env.IMAGE_NAME}/pipeline/pr-${env.CHANGE_TARGET}"
+                        def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
                         notify(context, GITEA_USER, GITEA_PASS, env.GITEA_REPOSITORY_URL, env.IMAGE_NAME, commitHash, "success")
                     }
                 }