status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7466 from hashicorp/dnephin/support-cherry-pick-merge-PRs 

ci: support cherry-picking of merge PRs
This commit is contained in:
Daniel Nephin 2020-03-18 13:12:42 -04:00 committed by GitHub
parent 1ff9b748ae 887e410cd6
commit a103c62f33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/scripts/cherry-picker.sh
View File

@ -27,7 +27,7 @@ function cherry_pick_with_slack_notification {
git checkout $branch || exit 1 git checkout $branch || exit 1
# If git cherry-pick fails, we send a failure notification # If git cherry-pick fails, we send a failure notification
if ! git cherry-pick $commit; then if ! git cherry-pick --mainline 1 $commit; then
status "🍒❌ Cherry pick of commit ${commit:0:7} from $pr_url onto $branch failed!" status "🍒❌ Cherry pick of commit ${commit:0:7} from $pr_url onto $branch failed!"
curl -X POST -H 'Content-type: application/json' \ curl -X POST -H 'Content-type: application/json' \
--data \ --data \