Jenkinsfile

@@ -86,7 +86,6 @@ 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()
                     withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) {
                         def prId = env.CHANGE_ID
 
@@ -99,6 +98,7 @@ pipeline {
                         """
                         echo "PR ${prId} merged successfully into main!"
 
+                        def mergeCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()
                         echo "Merge commit hash: ${mergeCommitHash}"
                         sh """
                             curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \

README.md

@@ -3,4 +3,3 @@
 ```bash
 docker build -t test-ci-cd .
 docker run --rm --name test-ci-cd -p 8000:8080 test-ci-cd:latest
-kakak3