Compare commits

...

2 Commits

Author SHA1 Message Date
deployer3000 6ed95153aa Merge pull request 'a' (#20) from rc into main 2025-04-09 17:44:34 +03:00
yuobrezkov b6ecb34090 a
test-org/test-ci-cd/pipeline/pr-main There was a failure building this commit Details
2025-04-09 17:43:00 +03:00
1 changed files with 1 additions and 2 deletions

3
Jenkinsfile vendored
View File

@ -85,7 +85,6 @@ pipeline {
script {
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 +97,7 @@ pipeline {
http://git.entcor/api/v1/repos/deployer3000/${env.IMAGE_NAME}/pulls/${prId}/merge
"""
echo "PR ${prId} merged successfully into main!"
def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
echo "Merge commit hash: ${mergeCommitHash}"
sh """
curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \