diff --git a/.github/workflows/call-issue-pr-tracker.yml b/.github/workflows/call-issue-pr-tracker.yml index 87243e2..2c30784 100644 --- a/.github/workflows/call-issue-pr-tracker.yml +++ b/.github/workflows/call-issue-pr-tracker.yml @@ -2,9 +2,11 @@ name: Issue & PR Tracker on: issues: - types: [opened,reopened,labeled,unlabeled] + types: [opened,reopened,labeled,unlabeled,closed] pull_request_target: - types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed] + pull_request_review: + types: [submitted,edited,dismissed] jobs: manage-project: diff --git a/.github/workflows/issue-pr-tracker.yml b/.github/workflows/issue-pr-tracker.yml index 7ea5262..5f0b81f 100644 --- a/.github/workflows/issue-pr-tracker.yml +++ b/.github/workflows/issue-pr-tracker.yml @@ -36,9 +36,27 @@ jobs: project_id: 8 resource_node_id: ${{ github.event.issue.node_id }} status_value: 'Insufficient Info' + - name: Move Closed Issues to Done + uses: leonsteinhaeuser/project-beta-automations@v2.1.0 + if: ${{ github.event.issue.state == 'closed' }} + with: + gh_token: ${{ secrets.CR_PAT }} + organization: linuxserver + project_id: 8 + resource_node_id: ${{ github.event.issue.node_id }} + status_value: 'Done' + - name: Move Closed PRs to Done + uses: leonsteinhaeuser/project-beta-automations@v2.1.0 + if: ${{ github.event.pull_request.state == 'closed' }} + with: + gh_token: ${{ secrets.CR_PAT }} + organization: linuxserver + project_id: 8 + resource_node_id: ${{ github.event.pull_request.node_id }} + status_value: 'Done' - name: Add Open PRs Without Review Requests uses: leonsteinhaeuser/project-beta-automations@v2.1.0 - if: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.state == 'open' && github.event.pull_request.requested_reviewers[0] == null && github.event.pull_request.requested_teams[0] == null }} + if: ${{ (github.event_name == 'pull_request_target' || github.event_name == 'pull_request_review') && github.event.pull_request.state == 'open' && github.event.pull_request.requested_reviewers[0] == null && github.event.pull_request.requested_teams[0] == null && github.event.review.state != 'approved' }} with: gh_token: ${{ secrets.CR_PAT }} organization: linuxserver @@ -47,7 +65,16 @@ jobs: status_value: 'PRs' - name: Add Open PRs With Review Requests uses: leonsteinhaeuser/project-beta-automations@v2.1.0 - if: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.state == 'open' && (github.event.pull_request.requested_reviewers[0] != null || github.event.pull_request.requested_teams[0] != null) }} + if: ${{ (github.event_name == 'pull_request_target' || github.event_name == 'pull_request_review') && github.event.pull_request.state == 'open' && (github.event.pull_request.requested_reviewers[0] != null || github.event.pull_request.requested_teams[0] != null) && github.event.review.state != 'approved' }} + with: + gh_token: ${{ secrets.CR_PAT }} + organization: linuxserver + project_id: 8 + resource_node_id: ${{ github.event.pull_request.node_id }} + status_value: 'PRs Ready For Team Review' + - name: Move Approved PRs + uses: leonsteinhaeuser/project-beta-automations@v2.1.0 + if: ${{ (github.event_name == 'pull_request_target' || github.event_name == 'pull_request_review') && github.event.pull_request.state == 'open' && github.event.review.state == 'approved' }} with: gh_token: ${{ secrets.CR_PAT }} organization: linuxserver