diff --git a/.github/workflows/pr-merge.yaml b/.github/workflows/pr-merge.yaml index 5f216100c..42ce6f157 100644 --- a/.github/workflows/pr-merge.yaml +++ b/.github/workflows/pr-merge.yaml @@ -1,12 +1,13 @@ name: Notify Discord on PR Merge on: workflow_dispatch: - pull_request: + pull_request_target: types: [closed] jobs: notify: runs-on: ubuntu-latest + if: github.event.pull_request.merged == true steps: - name: Get User Permission id: checkAccess @@ -23,11 +24,6 @@ echo "Current permission level is ${{ steps.checkAccess.outputs.user-permission }}" echo "Job originally triggered by ${{ github.actor }}" exit 1 - - name: Checkout code - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.head.sha }} # This is dangerous without the first access check - name: Send Discord notification - # if: github.event.pull_request.merged == true run: | curl -H "Content-Type: application/json" -d '{"content": "Pull Request ${{ github.event.pull_request.number }} merged by ${{ github.actor }}"}' ${{ secrets.DISCORD_WEBHOOK_BETA_TESTERS }}