From 71db1d2a321bf54cfcd47d0387d626b6f7b1fd1e Mon Sep 17 00:00:00 2001 From: yuobrezkov Date: Wed, 9 Apr 2025 17:39:46 +0300 Subject: [PATCH] k --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7be09c5..e43c086 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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": "${mergeCommitHash}"}' \ + -d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${commitHash}"}' \ "${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases" """ echo "New release succeeded!"