diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 6a115cd..b9f39b7 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -22,7 +22,7 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Auto-approve PRs by other users as team-tf-cdk - if: github.event.pull_request.user.login != 'team-tf-cdk' && (contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.pull_request.author_association) || github.actor == 'dependabot[bot]) + if: github.event.pull_request.user.login != 'team-tf-cdk' && (contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.pull_request.author_association) || github.actor == 'dependabot[bot]') env: GH_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }} run: gh pr review ${{ github.event.pull_request.number }} --approve diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 2b285c2..04370a1 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -20,7 +20,7 @@ jobs: - name: Checkout uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 - name: Turn on automerge for this PR by a trusted user or bot - if: github.event.pull_request.user.login == 'team-tf-cdk' || contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.pull_request.author_association) || github.actor == 'dependabot[bot] + if: github.event.pull_request.user.login == 'team-tf-cdk' || contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.pull_request.author_association) || github.actor == 'dependabot[bot]' env: GH_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }} run: gh pr merge --auto --squash ${{ github.event.pull_request.number }} diff --git a/projenrc/auto-approve.ts b/projenrc/auto-approve.ts index 388c6db..35fe1ed 100644 --- a/projenrc/auto-approve.ts +++ b/projenrc/auto-approve.ts @@ -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 }}", diff --git a/projenrc/automerge.ts b/projenrc/automerge.ts index cf353d2..aec07cc 100644 --- a/projenrc/automerge.ts +++ b/projenrc/automerge.ts @@ -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 }}",