diff --git a/.github/actions/ai-generated-release-notes/pr-details.js b/.github/actions/ai-generated-release-notes/pr-details.js index 2d0e0be5af..0f16fcd4bb 100755 --- a/.github/actions/ai-generated-release-notes/pr-details.js +++ b/.github/actions/ai-generated-release-notes/pr-details.js @@ -37,12 +37,14 @@ async function getPRDetails() { console.log('- PR Author:', pr.user.login); console.log('- PR Title:', pr.title); console.log('- Base Branch:', pr.base.ref); + console.log('- Head Branch:', pr.head.ref); const result = { number: pr.number, author: pr.user.login, title: pr.title, baseBranch: pr.base.ref, + headBranch: pr.head.ref, }; setOutput('result', JSON.stringify(result)); diff --git a/.github/workflows/ai-generated-release-notes.yml b/.github/workflows/ai-generated-release-notes.yml index a6ddb0449d..db6c0324a6 100644 --- a/.github/workflows/ai-generated-release-notes.yml +++ b/.github/workflows/ai-generated-release-notes.yml @@ -41,21 +41,12 @@ jobs: GITHUB_REPOSITORY: ${{ github.repository }} GITHUB_EVENT_ISSUE_NUMBER: ${{ github.event.issue.number }} - - name: Check if PR targets master branch - if: steps.check-first-comment.outputs.result == 'true' && steps.pr-details.outputs.result != 'null' - id: check-base-branch - run: | - BASE_BRANCH=$(echo '${{ steps.pr-details.outputs.result }}' | jq -r '.baseBranch') - echo "Base branch: $BASE_BRANCH" - if [ "$BASE_BRANCH" = "master" ]; then - echo "targets_master=true" >> $GITHUB_OUTPUT - else - echo "targets_master=false" >> $GITHUB_OUTPUT - echo "PR does not target master branch, skipping release notes generation" - fi - - name: Check if release notes file already exists - if: steps.check-first-comment.outputs.result == 'true' && steps.pr-details.outputs.result != 'null' && steps.check-base-branch.outputs.targets_master == 'true' + if: >- + steps.check-first-comment.outputs.result == 'true' && + steps.pr-details.outputs.result != 'null' && + fromJSON(steps.pr-details.outputs.result).baseBranch == 'master' && + !startsWith(fromJSON(steps.pr-details.outputs.result).headBranch, 'release/') id: check-release-notes-exists run: node .github/actions/ai-generated-release-notes/check-release-notes-exists.js env: diff --git a/upcoming-release-notes/7107.md b/upcoming-release-notes/7107.md new file mode 100644 index 0000000000..3bc8b24f9b --- /dev/null +++ b/upcoming-release-notes/7107.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [jfdoming] +--- + +Skip AI-generated release notes for PRs originating from `release/*` branches to avoid redundancy.