Skip to content

Commit

Permalink
chore: fix mergify auto-approve label (backport #197) (#201)
Browse files Browse the repository at this point in the history
This is an automatic backport of pull request #197 done by [Mergify](https://mergify.com).
Cherry-pick of dc8b3b3 has failed:
```
On branch mergify/bp/kubectl-v25/main/pr-197
Your branch is up to date with 'origin/kubectl-v25/main'.

You are currently cherry-picking commit dc8b3b3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .projenrc.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .mergify.yml

```


To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>
  • Loading branch information
mergify[bot] authored Mar 8, 2023
1 parent 31e98a8 commit 731e6ca
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .mergify.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
actions: {
backport: {
regexes: [`kubectl-v(?!20|${SPEC_VERSION})[\\d]*\\/main`],
},
label: {
add: ['auto-approve'],
labels: ['auto-approve'],
},
},
}],
Expand Down

0 comments on commit 731e6ca

Please sign in to comment.