Compare commits

...

3 Commits

Author SHA1 Message Date
deployer3000 85bdd4c9ba Merge pull request 'rc' (#31) from rc into main 2025-04-10 10:44:38 +03:00
yuobrezkov ce255a692a 123123123
test-org/test-ci-cd/pipeline/pr-main This commit looks good Details
2025-04-10 10:42:51 +03:00
yuobrezkov 415474e608 1 2025-04-10 10:42:42 +03:00
2 changed files with 5 additions and 2 deletions

4
Jenkinsfile vendored
View File

@ -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 """

View File

@ -3,3 +3,4 @@
```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