diff --git a/.github/workflows/auto_merge.yml b/.github/workflows/auto_merge.yml index de8e9734ddd..e6b1b8f3254 100644 --- a/.github/workflows/auto_merge.yml +++ b/.github/workflows/auto_merge.yml @@ -11,6 +11,7 @@ jobs: - uses: davideviolante/pr-automerge-action@v1.2.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: 'w3f/Open-Grants-Program' with: merge-method: 'squash' min-approvals: 3 diff --git a/.github/workflows/label_approval_count.yml b/.github/workflows/label_approval_count.yml deleted file mode 100644 index 6951683d43d..00000000000 --- a/.github/workflows/label_approval_count.yml +++ /dev/null @@ -1,32 +0,0 @@ -on: - pull_request_review: - types: [submitted] - -name: Label pull request approvals - -jobs: - labelWhen1Approved: - name: Awaiting 2 approvals - runs-on: ubuntu-latest - steps: - - name: Two remaining - uses: pullreminders/label-when-approved-action@master - env: - APPROVALS: "1" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ADD_LABEL: "Awaiting 2 approvals" - REMOVE_LABEL: "ready for review" - - name: One remaining - uses: pullreminders/label-when-approved-action@master - env: - APPROVALS: "2" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ADD_LABEL: "Awaiting 1 approval" - REMOVE_LABEL: "ready for review" - - name: Label when three approved - uses: pullreminders/label-when-approved-action@master - env: - APPROVALS: "3" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ADD_LABEL: "Approved 🚀" - REMOVE_LABEL: "Awaiting 1 approval"