diff --git a/.github/actions/ai-generated-release-notes/pr-details.js b/.github/actions/ai-generated-release-notes/pr-details.js index 555e635da6..2d0e0be5af 100755 --- a/.github/actions/ai-generated-release-notes/pr-details.js +++ b/.github/actions/ai-generated-release-notes/pr-details.js @@ -36,11 +36,13 @@ async function getPRDetails() { console.log('- PR Number:', pr.number); console.log('- PR Author:', pr.user.login); console.log('- PR Title:', pr.title); + console.log('- Base Branch:', pr.base.ref); const result = { number: pr.number, author: pr.user.login, title: pr.title, + baseBranch: pr.base.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 b2b5323766..a6ddb0449d 100644 --- a/.github/workflows/ai-generated-release-notes.yml +++ b/.github/workflows/ai-generated-release-notes.yml @@ -41,8 +41,21 @@ jobs: GITHUB_REPOSITORY: ${{ github.repository }} GITHUB_EVENT_ISSUE_NUMBER: ${{ github.event.issue.number }} - - name: Check if release notes file already exists + - 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' 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/6622.md b/upcoming-release-notes/6622.md new file mode 100644 index 0000000000..c1ad01d4f9 --- /dev/null +++ b/upcoming-release-notes/6622.md @@ -0,0 +1,6 @@ +--- +category: Enhancements +authors: [Copilot] +--- + +Update job trigger for auto-generated release notes to improve automation and efficiency.