Refactor

Author: igordmn

.github/workflows/check-release-notes-scripts.yml

@@ -5,19 +5,14 @@ name: Check "check-release-notes" action ans scripts
 on:
   pull_request:
     types: [opened, edited, synchronize]
-    # we run against PR branch if workflow/scripts are changed (to check changes)
-    # and against master branch otherwise (to apply up-to-date rules)
-    #
-    # paths should be the same as in [check-release-notes.yml]
+    # - run against the PR branch if workflow/scripts are changed (to verify and apply new rules in scripts)
     paths:
-      - '.github/workflows/check-release-notes-reusable.yml'
-      - '.github/workflows/check-release-notes-reusable-check.yml'
-      - 'tools'
+      - 'tools/changelog'
 
 jobs:
   check:
     runs-on: ubuntu-24.04
     steps:
-      - uses: JetBrains/compose-multiplatform/.github/actions/check-release-notes
+      - uses: JetBrains/compose-multiplatform/.github/actions/check-release-notes-github-action
         with:
           checkout_ref: '$GITHUB_REF'

.github/workflows/check-release-notes.yml

@@ -1,26 +1,21 @@
-# Checks Release Notes in the PR description, runs with rules from the main branch, when:
+# Checks Release Notes in the PR description, runs with rules from the master branch, when:
 #   opened - PR is opened
 #   edited - The title/description are changed
 #   synchronize - New commits appeared.
-#                 We don't use the new content, but we still need to mark this commit Green in GitHub UI
+#                 We don't use the new content, but we still need to mark this commit Green/Red in GitHub UI
 
 name: Check Release Notes in the description
 on:
   pull_request:
     types: [opened, edited, synchronize]
-    # we run against PR branch if workflow/scripts are changed (to check changes)
-    # and against master branch otherwise (to apply up-to-date rules)
-    #
-    # paths should be the same as in [check-release-notes-scripts.yml]
-   # paths-ignore:
-   #   - '.github/workflows/check-release-notes-reusable.yml'
-   #   - '.github/workflows/check-release-notes-reusable-check.yml'
-   #   - 'changelog.main.kts'
+    # - run against master branch if workflow/scripts aren't changed (to apply up-to-date rules to all PRs)
+    paths-ignore:
+      - 'tools/changelog'
 
 jobs:
   check:
     runs-on: ubuntu-24.04
     steps:
-      - uses: JetBrains/compose-multiplatform/tools/changelog/check-release-notes@igordmn-patch-7
+      - uses: JetBrains/compose-multiplatform/tools/changelog/check-release-notes-github-action@igordmn-patch-7
         with:
           checkout_ref: 'igordmn-patch-7'

tools/changelog/changelog.main.kts

@@ -322,18 +322,18 @@ fun GitHubPullEntry.extractReleaseNotes(): ReleaseNotes? {
 
     // extract body inside "# Release Notes"
     val relNoteBody = body
-            ?.replace("# Release notes", "# Release Notes", ignoreCase = true)
-            ?.replace("#Release notes", "# Release Notes", ignoreCase = true)
-            ?.replace("# RelNote", "# Release Notes", ignoreCase = true)
-            ?.run {
-                substringBetween("# Release Notes", "\n# ")
-                    ?: substringBetween("## Release Notes", "\n## ")
-                    ?: substringBetween("### Release Notes", "\n### ")
-                    ?: substringBetween("## Release Notes", "\n# ")
-                    ?: substringBetween("### Release Notes", "\n## ")
-                    ?: substringBetween("### Release Notes", "\n# ")
-            }
-            ?.trim()
+        ?.replace("# Release notes", "# Release Notes", ignoreCase = true)
+        ?.replace("#Release notes", "# Release Notes", ignoreCase = true)
+        ?.replace("# RelNote", "# Release Notes", ignoreCase = true)
+        ?.run {
+            substringBetween("# Release Notes", "\n# ")
+                ?: substringBetween("## Release Notes", "\n## ")
+                ?: substringBetween("### Release Notes", "\n### ")
+                ?: substringBetween("## Release Notes", "\n# ")
+                ?: substringBetween("### Release Notes", "\n## ")
+                ?: substringBetween("### Release Notes", "\n# ")
+        }
+        ?.trim()
 
     if (relNoteBody == null) return null
     if (relNoteBody.trim().lowercase() == "n/a") return ReleaseNotes.NA