Compare commits

..

No commits in common. "main" and "0.0.4" have entirely different histories.
main ... 0.0.4

2 changed files with 3 additions and 4 deletions

6
Jenkinsfile vendored
View File

@ -96,11 +96,9 @@ 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: 5, unit: 'SECONDS')
sh "git checkout main && git pull origin main" // пробуем спуллить, чтобы последний мёрдж коммит получить def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
def prCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim() def prCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()
sh """ sh """

View File

@ -3,4 +3,5 @@
```bash ```bash
docker build -t test-ci-cd . 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 123