Merge pull request 'rc' (#33) from rc into main

Jenkinsfile

@@ -96,15 +96,17 @@ pipeline {
                              -d '{"do":"merge"}' \
                              http://git.entcor/api/v1/repos/deployer3000/${env.IMAGE_NAME}/pulls/${prId}/merge
                         """
+                        def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim() // необходим для корректного отображения статусов
                         echo "PR ${prId} merged successfully into main!"
-                        def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()  
+                        sleep(time: 15, unit: 'SECONDS')
-                        def newCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()   
+                        sh "git checkout main && git pull origin main" // пробуем спуллить, чтобы последний мёрдж коммит получить
-                        echo "COMMIT_HASH ${commitHash}"
+                        
-                        echo "NEW_COMMIT_HASH ${newCommitHash} "                   
+                        def prCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()
+
                         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": "${newCommitHash}"}' \
+                            -d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${prCommitHash}"}' \
                             "${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases"
                         """
                         echo "New release succeeded!"

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
+docker run --rm --name test-ci-cd -p 8000:8080 test-ci-cd:latest
+123