Commit Graph

5 Commits

Author SHA1 Message Date
Violet Hynes adc23f0a77
VAULT-8242 Add automerge functionality to backport (#17506)
* VAULT-8242 Add automerge functionality to backport

* VAULT-8242 remove extra space
2022-10-12 13:59:34 -04:00
Nick Cabatoff 5672b0477d
Upgrade to newer backport-assistant and use the new feature BACKPORT_MERGE_COMMIT
This is from https://github.com/hashicorp/backport-assistant/pull/40, so that we backport only the merge commit instead of the individual PR commits. This requires that the PR have been merged using the squash commit strategy, which is our policy. (#15571)
2022-05-24 13:37:53 -04:00
Meggie c80d5805dc
Make backport assistant work with ENT backport tags (#13876)
* Make backport assistant work with ENT backport tags

I want the regexp to include word characters and the plus sign on
enterprise. I'm confused about the levels of escaping required, because
this is a shell env var that gets passed to a go program as a regular
expression. I didn't escape the square brackets because the parens
weren't escaped. I matched what was done previously with the '.'s for
the '+' because I also want that literal, but it was unclear from
playing around with https://regex101.com/ and go regexps whether the
extra backslashes were required for the '+' char.

* Update .github/workflows/backport.yml

Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>

Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
2022-02-02 16:37:56 -05:00
Meggie 5e316537f2
Splitting backport-asst GH action (#13461)
This way we can have an OSS action, and an ENT action. We'll be able to
keep the backport-assistant workflows the same on OSS and ENT for normal
PRs, and have a separate labeling system on OSS for docs backports.

We should delete the backport-docs.yml file on ENT.
2021-12-16 18:49:59 -05:00
Kevin Wang fafeb3717f
feat: add `backport.yml` (#13163)
* feat: add `backport.yml`

* feat: check releases over labels for latest

* chore: Do not automerge for non `stable-website`

* chore: Do not automerge to not `stable-website`

* Update .github/workflows/backport.yml

Co-authored-by: Meggie <meggie@hashicorp.com>

Co-authored-by: Meggie <meggie@hashicorp.com>
2021-12-15 18:16:35 -05:00