diff --git a/.github/workflows/octo-pr-feed.yml b/.github/workflows/octo-pr-feed.yml deleted file mode 100644 index 2c2e9b2..0000000 --- a/.github/workflows/octo-pr-feed.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Octo PR Feed - -on: - pull_request_target: # zizmor: ignore[dangerous-triggers] metadata-only automation; no PR code executed - types: [opened] - branches: [main] - -permissions: {} - -jobs: - notify: - if: ${{ !github.event.pull_request.draft }} - uses: Mininglamp-OSS/.github/.github/workflows/octo-pr-feed.yml@main - with: - repo_name: ${{ github.event.repository.name }} - pr_number: ${{ github.event.pull_request.number }} - pr_title: ${{ github.event.pull_request.title }} - pr_url: ${{ github.event.pull_request.html_url }} - pr_author: ${{ github.event.pull_request.user.login }} - pr_merged: ${{ github.event.pull_request.merged }} - pr_additions: ${{ github.event.pull_request.additions }} - pr_deletions: ${{ github.event.pull_request.deletions }} - pr_changed_files: ${{ github.event.pull_request.changed_files }} - event_action: ${{ github.event.action }} - project_group_id: 'a48e308c2ead4d9dbcdc30fff0f01eaf' - secrets: - OCTO_BOT_TOKEN: ${{ secrets.OCTO_BOT_TOKEN }} diff --git a/.github/workflows/octo-pr-result-notify.yml b/.github/workflows/octo-pr-result-notify.yml index 9c2ee1e..1dc8669 100644 --- a/.github/workflows/octo-pr-result-notify.yml +++ b/.github/workflows/octo-pr-result-notify.yml @@ -2,7 +2,7 @@ name: Octo PR Result Notify on: pull_request_target: - types: [closed, reopened] + types: [closed] pull_request_review: types: [submitted] @@ -18,10 +18,11 @@ jobs: pr_title: ${{ github.event.pull_request.title }} pr_url: ${{ github.event.pull_request.html_url }} pr_author: ${{ github.event.pull_request.user.login }} - event_kind: ${{ github.event.action == 'closed' && github.event.pull_request.merged == true && 'pr_merged' || github.event.action == 'closed' && 'pr_closed' || 'pr_reopened' }} + event_kind: ${{ github.event.pull_request.merged == true && 'pr_merged' || 'pr_closed' }} pr_additions: ${{ github.event.pull_request.additions }} pr_deletions: ${{ github.event.pull_request.deletions }} pr_changed_files: ${{ github.event.pull_request.changed_files }} + feed_group_id: ${{ vars.OCTO_PR_FEED_GROUP_ID || '1c303c142e9840f2a9b46c10b0972e8d' }} secrets: OCTO_BOT_TOKEN: ${{ secrets.OCTO_BOT_TOKEN }} @@ -39,5 +40,6 @@ jobs: pr_author: ${{ github.event.pull_request.user.login }} event_kind: ${{ github.event.review.state == 'approved' && 'review_approved' || 'review_changes_requested' }} reviewer: ${{ github.event.review.user.login }} + feed_group_id: ${{ vars.OCTO_PR_FEED_GROUP_ID || '1c303c142e9840f2a9b46c10b0972e8d' }} secrets: OCTO_BOT_TOKEN: ${{ secrets.OCTO_BOT_TOKEN }}