Merge pull request #1228 from mikepenz/feature/minor_adjustments

Minor improvements
mikepenz · Aug 25, 2023 · af326da · af326da
2 parents ac1ce19 + 5dd7722
commit af326da
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/__tests__/transform.test.ts b/__tests__/transform.test.ts
@@ -559,7 +559,7 @@ it('Use Rules to include a PR within a Category.', async () => {
       exclude_labels: ['Fix'],
       rules: [
         {
-          pattern: '[ABC-1234]',
+          pattern: '\\[ABC-1234\\]',
           on_property: 'title'
         },
         {

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/pr-collector/src/regexUtils.ts b/pr-collector/src/regexUtils.ts
@@ -54,7 +54,7 @@ export function buildRegex(
       onEmpty
     }
   } catch (e) {
-    core.warning(`⚠️ Bad replacer regex: ${regex.pattern}`)
+    core.warning(`⚠️ Bad regex: ${regex.pattern} (${e})`)
     return null
   }
 }
diff --git a/src/transform.ts b/src/transform.ts
@@ -62,7 +62,7 @@ export function buildChangelog(diffInfo: DiffInfo, origPrs: PullRequestInfo[], o
             }
             parent.childPrs.push(pr)
           } else {
-            if (!valid) core.warning(`⚠️ Extracted reference 'isNaN': ${extracted}`)
+            if (!valid) core.debug(`⚠️ Extracted reference 'isNaN': ${extracted}`)
             remappedPrs.push(pr)
           }
         } else {
@@ -197,7 +197,7 @@ export function buildChangelog(diffInfo: DiffInfo, origPrs: PullRequestInfo[], o
         if (category.exhaustive_rules !== undefined) {
           exhaustive_rules = category.exhaustive_rules
         }
-        if (matched && category.rules !== undefined) {
+        if ((matched || category.labels === undefined) && category.rules !== undefined) {
           matched = matchesRules(category.rules, pr, exhaustive_rules)
         }
       } else {