Merge branch 'rc' into refactoring
test-org/trust-module-frontend/pipeline/pr-rc This commit looks good
Details
test-org/trust-module-frontend/pipeline/pr-rc This commit looks good
Details
commit
dee4e21e09
|
|
@ -41,7 +41,6 @@ pipeline {
|
||||||
always {
|
always {
|
||||||
script {
|
script {
|
||||||
echo "Cleaning up workspace..."
|
echo "Cleaning up workspace..."
|
||||||
sh "rm -rf ${env.WORKSPACE}/package/ || true"
|
|
||||||
sh "rm -rf ${env.WORKSPACE}/rc/ || true"
|
sh "rm -rf ${env.WORKSPACE}/rc/ || true"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -56,7 +55,7 @@ pipeline {
|
||||||
-u "${GITEA_USER}:${GITEA_PASS}" \
|
-u "${GITEA_USER}:${GITEA_PASS}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d '{"do":"merge"}' \
|
-d '{"do":"merge"}' \
|
||||||
http://git.entcor/api/v1/repos/DmitriyA/trust-module-frontend/pulls/${prId}/merge
|
http://git.entcor/api/v1/repos/deployer3000/trust-module-frontend/pulls/${prId}/merge
|
||||||
"""
|
"""
|
||||||
echo "PR ${prId} merged successfully into master!"
|
echo "PR ${prId} merged successfully into master!"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue