Compare commits
9 Commits
| Author | SHA1 | Date |
|---|---|---|
|
|
19889e9767 | |
|
|
c24d18e6e1 | |
|
|
344d1a5055 | |
|
|
846965c41e | |
|
|
9f288fb3fa | |
|
|
2f359f6b81 | |
|
|
85bdd4c9ba | |
|
|
ce255a692a | |
|
|
415474e608 |
|
|
@ -96,15 +96,17 @@ 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 """
|
||||||
curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \
|
curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "main"}' \
|
-d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${prCommitHash}"}' \
|
||||||
"${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases"
|
"${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases"
|
||||||
"""
|
"""
|
||||||
echo "New release succeeded!"
|
echo "New release succeeded!"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue