Merge pull request 'k' (#18) from rc into main

Reviewed-on: http://192.168.2.61/deployer3000/test-ci-cd/pulls/18

Jenkinsfile

@@ -86,7 +86,7 @@ pipeline {
                 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()
+                    // 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
 
@@ -103,7 +103,7 @@ pipeline {
                         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": "${mergeCommitHash}"}' \
+                            -d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${commitHash}"}' \
                             "${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases"
                         """
                         echo "New release succeeded!"