Commit Graph

16 Commits

Author SHA1 Message Date
Daniel Nephin a43731fc32 ci: allow cherry-picking a manual backport to other release branches
If an automatic backport fails to more than one release branch we need
to crate a PR to backport it. So far we've had to create a backport PR
for each target release branch.

With this change, we may be able to create only a single PR, and then
run the backport automation to cherry-pick it into other release
branches.

The idea is that if a change introduced in version n-1 caused a
conflict, and there are no other changes, then the backport automation
should be able to use the same commit for version n-2 and n-3.
2021-05-06 12:32:58 -04:00
Matt Keeler 7093e48f97
[Backport/1.9.x] Backport #10073 (#10104)
* Merge pull request #10094 from hashicorp/update-fingerprint

updating fingerprint

* Add replication metrics (#10073)

Co-authored-by: Daniel Nephin <dnephin@hashicorp.com>
2021-04-23 16:17:09 -04:00
Alvin Huang e918da9c40
fix command in cherry-picker script (#8738) 2020-09-23 09:59:17 -04:00
Alvin Huang 958d12907c
cherrypick docs to latest release branch (#8719) 2020-09-21 17:31:21 -04:00
Alvin Huang 2a95289f56
remove set -e for cherry-pick script since we collect errors (#8177) 2020-06-23 18:37:20 -04:00
Alvin Huang 158361fb35
Add GitHub Notifications for cherry picks (#8115)
* add github PR notification for backport cherry picks

* count number of backport failures and exit after looping through all of them
2020-06-16 14:18:53 -04:00
Alvin Huang 38da343790
re-enable auto cherry-picking after website launch (#7897)
* re-enable auto cherry-picking after website launch

* change to regex since we renamed docs-cherrypick to type/docs-cherrypick
2020-05-14 16:53:51 -04:00
Alvin Huang 30acb31035
disable stable-website auto cherry-pick until replatform is merged into stable-website (#7726) 2020-04-28 17:01:51 -04:00
Alvin Huang 170b2ab8ee
add ssh package and push to branch before notifying (#7517) 2020-03-26 15:23:31 -04:00
Daniel Nephin b298249a14 ci: Move shebang to first line of cherry pick script
Also ran shellcheck against the script and fixed the other errors
2020-03-25 11:57:56 -04:00
Daniel Nephin 887e410cd6 ci: support cherry-picking of merge PRs
This change assumes that it is always safe to use the first commit
parent as the mainline. I believe this assumption is safe with a
github merge workflow.
2020-03-18 12:38:04 -04:00
Alvin Huang 062823b09a
cherry pick 'docs-cherrypick' label rather than 'docs' to stable-website (#7443) 2020-03-12 13:22:51 -04:00
Alvin Huang 8fbd812be9
add Authorization header in GitHub API call (#7436) 2020-03-11 13:25:15 -04:00
Alvin Huang 0dd8c44291
set pr_url outside if (#7424) 2020-03-10 12:31:58 -04:00
Alvin Huang cb6291a868
add slack notifications for cherry-pick (#7423) 2020-03-10 11:47:23 -04:00
Alvin Huang 45bbb6e035
add auto cherry-picking (#7406)
* add auto cherry-picking

* exit on git cherry-pick failure

* release branches are #.#.x
2020-03-06 17:59:14 -05:00