diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 092ec8b42..0913182d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,8 @@ name: ๐Ÿงช CI on: merge_group: + types: + - checks_requested pull_request: push: branches: [main] diff --git a/.github/workflows/pr-description.yml b/.github/workflows/pr-description.yml index afb9fe5c5..d108aaab2 100644 --- a/.github/workflows/pr-description.yml +++ b/.github/workflows/pr-description.yml @@ -2,6 +2,8 @@ name: ๐Ÿงผ PR on: merge_group: + types: + - checks_requested pull_request: types: - demilestoned @@ -21,6 +23,11 @@ jobs: - uses: actions/github-script@v7 with: script: | + if (context.eventName === 'merge_group') { + // Ignore merge_group events + return; + } + const body = context.payload.pull_request.body || ''; const errors = []; @@ -61,10 +68,16 @@ jobs: - uses: actions/github-script@v7 with: script: | - // Get the pull request data - const milestone = context.payload.pull_request.milestone; - if (!milestone) { - core.setFailed('โŒ Pull request must have a milestone assigned before merging.'); - return; + if (context.eventName === 'merge_group') { + // Ignore merge_group events + } else if (context.eventName === 'pull_request') { + // Get the pull request data + const milestone = context.payload.pull_request.milestone; + if (!milestone) { + core.setFailed('โŒ Pull request must have a milestone assigned before merging.'); + return; + } + console.log(`โœ… Milestone found: ${milestone.title}`); + } else { + core.setFailed(`โŒ Unknown event type ${context.eventName}.`); } - console.log(`โœ… Milestone found: ${milestone.title}`);