Merge pull request 'совершенно новый релиз' (#6) from rc into main

pull/13/head
deployer3000 2025-04-09 16:25:36 +03:00
commit 1cf3c77b94
1 changed files with 2 additions and 2 deletions

4
Jenkinsfile vendored
View File

@ -82,12 +82,13 @@ pipeline {
script { script {
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()
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
sh """ sh """
curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \ curl -v -X POST -u "${GITEA_USER}:${GITEA_PASS}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${env.GIT_COMMIT}"}' \ -d '{"tag_name": "${env.NEW_VERSION}", "name": "Release ${env.NEW_VERSION}", "target_commitish": "${commitHash}"}' \
"${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases" "${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases"
""" """
echo "New release succeeded!" echo "New release succeeded!"
@ -101,7 +102,6 @@ pipeline {
""" """
echo "PR ${prId} merged successfully into main!" echo "PR ${prId} merged successfully into main!"
def context = "test-org/${env.IMAGE_NAME}/pipeline/pr-${env.CHANGE_TARGET}" def context = "test-org/${env.IMAGE_NAME}/pipeline/pr-${env.CHANGE_TARGET}"
def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim()
notify(context, GITEA_USER, GITEA_PASS, env.GITEA_REPOSITORY_URL, env.IMAGE_NAME, commitHash, "success") notify(context, GITEA_USER, GITEA_PASS, env.GITEA_REPOSITORY_URL, env.IMAGE_NAME, commitHash, "success")
} }
} }