Compare commits
No commits in common. "84cdf8cdd38f27c939c97df4097e55d288209aa0" and "219a02b1deb8cac0c2ea82d03d3cdc53e27a3760" have entirely different histories.
84cdf8cdd3
...
219a02b1de
|
|
@ -86,7 +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()
|
||||
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
|
||||
|
||||
|
|
@ -103,7 +103,7 @@ pipeline {
|
|||
sh """
|
||||
curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${commitHash}"}' \
|
||||
-d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${mergeCommitHash}"}' \
|
||||
"${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases"
|
||||
"""
|
||||
echo "New release succeeded!"
|
||||
|
|
|
|||
Loading…
Reference in New Issue