diff --git a/Jenkinsfile b/Jenkinsfile index b2a6b35..f097410 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -88,14 +88,6 @@ pipeline { def commitHash = sh(script: "git rev-parse HEAD~1", returnStdout: true).trim() withCredentials([usernamePassword(credentialsId: 'gitea_creds', usernameVariable: 'GITEA_USER', passwordVariable: 'GITEA_PASS')]) { def prId = env.CHANGE_ID - echo "GIT_COMMIT: ${env.GIT_COMMIT}" - 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}}"}' \ - "${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases" - """ - echo "New release succeeded!" sh """ curl -X POST \ @@ -105,6 +97,16 @@ pipeline { http://git.entcor/api/v1/repos/deployer3000/${env.IMAGE_NAME}/pulls/${prId}/merge """ echo "PR ${prId} merged successfully into main!" + + echo "GIT_COMMIT: ${env.GIT_COMMIT}" + 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}"}' \ + "${env.GITEA_REPOSITORY_URL}deployer3000/${env.IMAGE_NAME}/releases" + """ + echo "New release succeeded!" + def context = "test-org/${env.IMAGE_NAME}/pipeline/pr-${env.CHANGE_TARGET}" notify(context, GITEA_USER, GITEA_PASS, env.GITEA_REPOSITORY_URL, env.IMAGE_NAME, commitHash, "success") }