fix(ci): CHANGELOG.md generation fix for 'no change' and yoshi-code-bot email (#9566)

suztomo · web-flow · commit 6a5d80515d37 · 2023-06-21T10:41:03.000-04:00
diff --git a/.github/release-note-generation/split_release_note.py b/.github/release-note-generation/split_release_note.py
@@ -94,10 +94,14 @@ def create_changelog_entry(current_date: str, module: LibraryModule,
         changelog_entry += '### Features\n\n'
         for line in changelog_lines:
             changelog_entry += f'* {line}\n'
+        changelog_entry += '\n'
     if dependency_changes:
-        changelog_entry += "\n### Dependencies\n\n"
+        changelog_entry += "### Dependencies\n\n"
         for line in dependency_changes:
             changelog_entry += f'* {line}\n'
+
+    if len(changelog_lines) == 0 and len(dependency_changes) == 0:
+        changelog_entry += '* No change\n'
     return changelog_entry
 
 
diff --git a/.github/release-note-generation/unit_test.py b/.github/release-note-generation/unit_test.py
@@ -14,7 +14,6 @@
 class TestCase(unittest.TestCase):
 
     def test_create_changelog_entry(self):
-        # do something
         entry = create_changelog_entry(
             '2023-06-10',
             dummy_module,
@@ -34,6 +33,31 @@ def test_create_changelog_entry(self):
 * update google-cloud-shared-dependencies to 1.2.3
 ''')
 
+    def test_create_changelog_entry_only_deps(self):
+        entry = create_changelog_entry(
+            '2023-06-10',
+            dummy_module,
+            [],
+            ['update google-cloud-shared-dependencies to 1.2.3']
+        )
+        self.assertEqual(entry, f'''## 1.2.3 (2023-06-10)
+
+### Dependencies
+
+* update google-cloud-shared-dependencies to 1.2.3
+''')
+
+    def test_create_changelog_entry_empty(self):
+        entry = create_changelog_entry(
+            '2023-06-10',
+            dummy_module,
+            [],
+            []
+        )
+        self.assertEqual(entry, f'''## 1.2.3 (2023-06-10)
+
+* No change
+''')
 
     def test_group_changes_by_api(self):
         main_changes = [
diff --git a/.github/workflows/changelog_generation.yaml b/.github/workflows/changelog_generation.yaml
@@ -22,7 +22,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-        fetch-depth: 0
         ref: ${{ github.head_ref }}
     - name: Show status of the branch checked out
       run: |
@@ -40,7 +39,7 @@ jobs:
         python3 .github/release-note-generation/split_release_note.py pr_body.txt .
     - name: Commit the change and push to the pull request branch
       run: |
-        git config user.email "yoshi-code-bot[bot]@users.noreply.github.com"
+        git config user.email "yoshi-code-bot@users.noreply.github.com"
         git config user.name "yoshi-code-bot"
         git remote set-url origin https://x-access-token:${{ secrets.YOSHI_CODE_BOT_TOKEN }}@github.com/${{ github.repository }}
         git add ./*/CHANGELOG.md
