Compare commits

..

3 Commits

Author SHA1 Message Date
deployer3000 8f80603f78 Merge pull request 'rc' (#15) from rc into main 2025-04-09 17:34:11 +03:00
yuobrezkov 618c0caed0 про2
test-org/test-ci-cd/pipeline/pr-main This commit looks good Details
2025-04-09 17:32:28 +03:00
yuobrezkov f109b6b904 про1
test-org/test-ci-cd/pipeline/pr-main Build succeeded
2025-04-09 17:32:14 +03:00
2 changed files with 3 additions and 2 deletions

2
Jenkinsfile vendored
View File

@ -86,6 +86,7 @@ pipeline {
if (env.CHANGE_BRANCH?.startsWith('rc')) {
echo "Attempting to merge PR ${env.CHANGE_ID} into master..."
def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
def mergeCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()
withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) {
def prId = env.CHANGE_ID
@ -98,7 +99,6 @@ pipeline {
"""
echo "PR ${prId} merged successfully into main!"
def mergeCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()
echo "Merge commit hash: ${mergeCommitHash}"
sh """
curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \

View File

@ -3,3 +3,4 @@
```bash
docker build -t test-ci-cd .
docker run --rm --name test-ci-cd -p 8000:8080 test-ci-cd:latest
kakak3