diff --git a/.circleci/scripts/cherry-picker.sh b/.circleci/scripts/cherry-picker.sh index 5ce06d99e0..52a293f6bd 100755 --- a/.circleci/scripts/cherry-picker.sh +++ b/.circleci/scripts/cherry-picker.sh @@ -100,14 +100,13 @@ for label in $labels; do git config --local user.email "hashicorp-ci@users.noreply.github.com" git config --local user.name "hashicorp-ci" status "checking label: $label" - # TODO: enable this when replatform is merged into stable-website # if the label matches docs-cherrypick, it will attempt to cherry-pick to stable-website - # if [[ $label == docs-cherrypick ]]; then - # status "backporting to stable-website" - # branch="stable-website" - # cherry_pick_with_slack_notification "$branch" "$CIRCLE_SHA1" "$pr_url" + if [[ $label =~ docs-cherrypick ]]; then + status "backporting to stable-website" + branch="stable-website" + cherry_pick_with_slack_notification "$branch" "$CIRCLE_SHA1" "$pr_url" # else if the label matches backport/*, it will attempt to cherry-pick to the release branch - if [[ $label =~ backport/* ]]; then + elif [[ $label =~ backport/* ]]; then status "backporting to $label" branch="${label/backport/release}.x" cherry_pick_with_slack_notification "$branch" "$CIRCLE_SHA1" "$pr_url"