From 415474e6087008cd3e25ff60987516e9575c0366 Mon Sep 17 00:00:00 2001 From: yuobrezkov Date: Thu, 10 Apr 2025 10:42:42 +0300 Subject: [PATCH] 1 --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4c2ecc5..b08ab58 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,9 +96,11 @@ 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!" sleep(time: 15, unit: 'SECONDS') - def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim() + sh "git checkout main && git pull origin main" // пробуем спуллить, чтобы последний мёрдж коммит получить + def prCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim() sh """