Compare commits
19 Commits
| Author | SHA1 | Date |
|---|---|---|
|
|
19889e9767 | |
|
|
c24d18e6e1 | |
|
|
344d1a5055 | |
|
|
846965c41e | |
|
|
9f288fb3fa | |
|
|
2f359f6b81 | |
|
|
85bdd4c9ba | |
|
|
ce255a692a | |
|
|
415474e608 | |
|
|
3b7cdda4e4 | |
|
|
20f2a86ccf | |
|
|
10730582da | |
|
|
fddba6946d | |
|
|
4b099e73bf | |
|
|
d0aa52bf1d | |
|
|
8660b8b2ac | |
|
|
0d51a0e332 | |
|
|
099692fc02 | |
|
|
6e8e590ec9 |
|
|
@ -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: 5, 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