Compare commits
3 Commits
e10bb09d7b
...
8f80603f78
| Author | SHA1 | Date |
|---|---|---|
|
|
8f80603f78 | |
|
|
618c0caed0 | |
|
|
f109b6b904 |
|
|
@ -86,6 +86,7 @@ pipeline {
|
||||||
if (env.CHANGE_BRANCH?.startsWith('rc')) {
|
if (env.CHANGE_BRANCH?.startsWith('rc')) {
|
||||||
echo "Attempting to merge PR ${env.CHANGE_ID} into master..."
|
echo "Attempting to merge PR ${env.CHANGE_ID} into master..."
|
||||||
def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
|
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')]) {
|
withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) {
|
||||||
def prId = env.CHANGE_ID
|
def prId = env.CHANGE_ID
|
||||||
|
|
||||||
|
|
@ -98,7 +99,6 @@ pipeline {
|
||||||
"""
|
"""
|
||||||
echo "PR ${prId} merged successfully into main!"
|
echo "PR ${prId} merged successfully into main!"
|
||||||
|
|
||||||
def mergeCommitHash = sh(script: "git rev-parse HEAD", returnStdout: true).trim()
|
|
||||||
echo "Merge commit hash: ${mergeCommitHash}"
|
echo "Merge commit hash: ${mergeCommitHash}"
|
||||||
sh """
|
sh """
|
||||||
curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \
|
curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue