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 #10167 from hashicorp/dnephin/ci-cherry-pick-on-release-branch 

ci: allow cherry-picking a manual backport to other release branches
This commit is contained in:
Daniel Nephin 2021-05-04 13:49:17 -04:00 committed by GitHub
parent 8f9d5c8eef c8f53a1d52
commit f2489e098f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/config.yml
View File

@ -1123,6 +1123,7 @@ workflows:
branches: branches:
only: only:
- master - master
- /release\/\d+\.\d+\.x$/
load-test: load-test:
when: << pipeline.parameters.trigger-load-test >> when: << pipeline.parameters.trigger-load-test >>
jobs: jobs:

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

@ -165,11 +165,12 @@ if echo "$resp" | jq -e '.items[].labels[] | select(.name | contains("docs-cherr
fi fi
fi fi
git config --local user.email "github-team-consul-core@hashicorp.com"
git config --local user.name "hc-github-team-consul-core"
backport_failures=0 backport_failures=0
# loop through all labels on the PR # loop through all labels on the PR
for label in $labels; do for label in $labels; do
git config --local user.email "github-team-consul-core@hashicorp.com"
git config --local user.name "hc-github-team-consul-core"
status "checking label: $label" status "checking label: $label"
# if the label matches docs-cherrypick, it will attempt to cherry-pick to stable-website # if the label matches docs-cherrypick, it will attempt to cherry-pick to stable-website
if [[ $label =~ docs-cherrypick ]]; then if [[ $label =~ docs-cherrypick ]]; then