Commit f0dbe93643 for woocommerce

commit f0dbe9364333c7184100ae04d5149e1840f8818d
Author: Jorge A. Torres <jorge.torres@automattic.com>
Date:   Fri Jan 9 15:45:34 2026 +0000

    Skip changelog auto-add on bot-generated PRs (#62737)

diff --git a/.github/workflows/changelog-auto-add.yml b/.github/workflows/changelog-auto-add.yml
index c90ac0805a..678754f665 100644
--- a/.github/workflows/changelog-auto-add.yml
+++ b/.github/workflows/changelog-auto-add.yml
@@ -28,7 +28,7 @@ env:
 jobs:
     add-changelog:
         name: 'Add changelog to PR'
-        if: ${{ github.event.pull_request.user.login != 'github-actions[bot]' && ( github.event_name != 'pull_request_target' || contains( github.event.pull_request.body, '[x] Automatically create a changelog' ) ) }}
+        if: ${{ github.event.pull_request.user.login != 'github-actions[bot]' && github.event.pull_request.user.login != 'woocommercebot' && ( github.event_name != 'pull_request_target' || contains( github.event.pull_request.body, '[x] Automatically create a changelog' ) ) }}
         runs-on: ubuntu-latest
         permissions:
             contents: write
diff --git a/.github/workflows/shared-cherry-pick.yml b/.github/workflows/shared-cherry-pick.yml
index e7f5160a0a..a284169faf 100644
--- a/.github/workflows/shared-cherry-pick.yml
+++ b/.github/workflows/shared-cherry-pick.yml
@@ -270,6 +270,11 @@ jobs:

               prBody += `## Original PR Description\n\n${originalPr.body || '*No description provided*'}`;

+              // Replace milestone selection and changelog sections.
+              prBody = prBody.replace(/\[\s*(?:[xX])?\s*\]\s*(Automatically create a changelog.*)/g, '[ ] ~~$1~~');
+              prBody = prBody.replace(/\[\s*(?:[xX])?\s*\]\s*(This Pull Request does not require a changelog.*)/g, '[ ] ~~$1~~');
+              prBody = prBody.replace(/\[\s*(?:[xX])?\s*\]\s*(Automatically assign milestone.*\*\*.*next WooCommerce version.*\*\*.*)/g, '[ ] ~~$1~~');
+
               // Create new PR
               const { data: newPr } = await github.rest.pulls.create({
                 owner: context.repo.owner,