Merge pull request #293 from mikepenz/develop

dev -> main

README.md

@@ -190,7 +190,10 @@ This configuration is a `.json` file in the following format.
     ],
     "tag_resolver": {
       "method": "semver"
-    }
+    },
+    "base_branches": [
+      "dev"
+    ]
 }
 ```
 
@@ -301,6 +304,7 @@ Table of descriptions for the `configuration.json` options to configure the resu
 | exclude_merge_branches      | An array of branches to be ignored from processing as merge commits                                                                                                                                                                |
 | tag_resolver                | Section to provide configuration for the tag resolving logic. Used if no `fromTag` is provided                                                                                                                                     |
 | tag_resolver.method         | Defines the method to use. Current options are: `semver`, `sort`. Default: `semver`                                                                                                                                                |
+| base_branches         | The target branches for the merged PR, ingnores PRs with different target branch. Values can be a `regex`. Default: allow all base branches
 
 ## Contribute 🧬
 

__tests__/releaseNotes.test.ts

@@ -159,3 +159,43 @@ it('Should match ordered DESC', async () => {
     `## 🚀 Features\n\n28\n26\n25\n24\n22\n\n## 🐛 Fixes\n\n23\n\n`
   )
 })
+
+it('Should ignore PRs not merged into develop branch', async () => {
+  const configuration = resolveConfiguration(
+    '',
+    'configs_test/configuration_base_branches_develop.json'
+  )
+  const releaseNotes = new ReleaseNotes(octokit, {
+    owner: 'mikepenz',
+    repo: 'release-changelog-builder-action',
+    fromTag: 'v1.3.1',
+    toTag: 'v1.4.0',
+    failOnError: false,
+    commitMode: false,
+    configuration: configuration
+  })
+
+  const changeLog = await releaseNotes.pull()
+  console.log(changeLog)
+  expect(changeLog).toStrictEqual(`\n\n150\n\n`)
+})
+
+it('Should ignore PRs not merged into main branch', async () => {
+  const configuration = resolveConfiguration(
+    '',
+    'configs_test/configuration_base_branches_main.json'
+  )
+  const releaseNotes = new ReleaseNotes(octokit, {
+    owner: 'mikepenz',
+    repo: 'release-changelog-builder-action',
+    fromTag: 'v1.3.1',
+    toTag: 'v1.4.0',
+    failOnError: false,
+    commitMode: false,
+    configuration: configuration
+  })
+
+  const changeLog = await releaseNotes.pull()
+  console.log(changeLog)
+  expect(changeLog).toStrictEqual(`\n\n153\n\n`)
+})

configs_test/configuration_base_branches_develop.json

@@ -0,0 +1,24 @@
+{
+  "categories": [
+    {
+      "title": "",
+      "labels": [
+        "dev",
+        "Bump"
+      ]
+    }
+  ],
+  "ignore_labels": [],
+  "sort": "DESC",
+  "pr_template": "${{NUMBER}}",
+  "label_extractor": [
+    {
+      "pattern": ".*(dev|Bump).*",
+      "target": "$1",
+      "on_property": "title"
+    }
+  ],
+  "base_branches": [
+    "develop"
+  ]
+}

configs_test/configuration_base_branches_main.json

@@ -0,0 +1,24 @@
+{
+  "categories": [
+    {
+      "title": "",
+      "labels": [
+        "dev",
+        "Bump"
+      ]
+    }
+  ],
+  "ignore_labels": [],
+  "sort": "DESC",
+  "pr_template": "${{NUMBER}}",
+  "label_extractor": [
+    {
+      "pattern": ".*(dev|Bump).*",
+      "target": "$1",
+      "on_property": "title"
+    }
+  ],
+  "base_branches": [
+    "main"
+  ]
+}