From f109b6b904dae6a220f31c90feefbe08b34fb8d8 Mon Sep 17 00:00:00 2001
From: yuobrezkov <yurakirin9545@gmail.com>
Date: Wed, 9 Apr 2025 17:32:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile | 2 +-
 README.md   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4e12946..7be09c5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -86,6 +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()
                     withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) {
                         def prId = env.CHANGE_ID
 
@@ -98,7 +99,6 @@ 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}" \
diff --git a/README.md b/README.md
index d0027cf..a01981c 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,5 @@
 
 ```bash
 docker build -t test-ci-cd .
-docker run --rm --name test-ci-cd -p 8000:8080 test-ci-cd:latest
\ No newline at end of file
+docker run --rm --name test-ci-cd -p 8000:8080 test-ci-cd:latest
+kakak
\ No newline at end of file