Compare commits
3 Commits
3b7cdda4e4
...
85bdd4c9ba
| Author | SHA1 | Date |
|---|---|---|
|
|
85bdd4c9ba | |
|
|
ce255a692a | |
|
|
415474e608 |
|
|
@ -96,9 +96,11 @@ pipeline {
|
||||||
-d '{"do":"merge"}' \
|
-d '{"do":"merge"}' \
|
||||||
http://git.entcor/api/v1/repos/deployer3000/${env.IMAGE_NAME}/pulls/${prId}/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!"
|
echo "PR ${prId} merged successfully into main!"
|
||||||
sleep(time: 15, unit: 'SECONDS')
|
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()
|
def prCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()
|
||||||
|
|
||||||
sh """
|
sh """
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue