Compare commits
No commits in common. "6ed95153aa179cf4f80b8f3d1557db0593dbffb3" and "342dafa6d08ab8307bfdbbb7b7bc8f4e6d2eb91e" have entirely different histories.
6ed95153aa
...
342dafa6d0
|
|
@ -85,6 +85,7 @@ 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
|
||||
|
|
@ -97,7 +98,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}" \
|
||||
|
|
|
|||
Loading…
Reference in New Issue