Skip to content

Commit

Permalink
chore: fix broken automerge and auto-approve workflows (#283)
Browse files Browse the repository at this point in the history
  • Loading branch information
xiehan authored Oct 31, 2023
1 parent a94f4d2 commit 8899a1a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve.yml

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

2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml

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

2 changes: 1 addition & 1 deletion projenrc/auto-approve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class AutoApprove {
},
{
name: "Auto-approve PRs by other users as team-tf-cdk",
if: `github.event.pull_request.user.login != 'team-tf-cdk' && (contains(${maintainerStatuses}, github.event.pull_request.author_association) || github.actor == 'dependabot[bot])`,
if: `github.event.pull_request.user.login != 'team-tf-cdk' && (contains(${maintainerStatuses}, github.event.pull_request.author_association) || github.actor == 'dependabot[bot]')`,
run: "gh pr review ${{ github.event.pull_request.number }} --approve",
env: {
GH_TOKEN: "${{ secrets.PROJEN_GITHUB_TOKEN }}",
Expand Down
2 changes: 1 addition & 1 deletion projenrc/automerge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class Automerge {
},
{
name: "Turn on automerge for this PR by a trusted user or bot",
if: `github.event.pull_request.user.login == 'team-tf-cdk' || contains(${maintainerStatuses}, github.event.pull_request.author_association) || github.actor == 'dependabot[bot]`,
if: `github.event.pull_request.user.login == 'team-tf-cdk' || contains(${maintainerStatuses}, github.event.pull_request.author_association) || github.actor == 'dependabot[bot]'`,
run: "gh pr merge --auto --squash ${{ github.event.pull_request.number }}",
env: {
GH_TOKEN: "${{ secrets.PROJEN_GITHUB_TOKEN }}",
Expand Down

0 comments on commit 8899a1a

Please sign in to comment.