mikepenz/release-changelog-builder-action
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- slightly improve filtering code

Browse Source 
- format config / readme
This commit is contained in:
Mike Penz
2021-04-30 10:29:09 +02:00
parent c49b84ec4a
commit 3a59a463ad
4 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+3 -1
View File
@@ -191,7 +191,9 @@ This configuration is a `.json` file in the following format.
"tag_resolver": { "tag_resolver": {
"method": "semver" "method": "semver"
}, },
"base_branches": [] "base_branches": [
"dev"
]
} }
``` ```
configs_test/configuration_base_branches_develop.json
+22 -17
View File
@@ -1,19 +1,24 @@
{ {
"categories": [ "categories": [
{ {
"title": "", "title": "",
"labels": ["dev", "Bump"] "labels": [
} "dev",
], "Bump"
"ignore_labels": [], ]
"sort": "DESC", }
"pr_template": "${{NUMBER}}", ],
"label_extractor": [ "ignore_labels": [],
{ "sort": "DESC",
"pattern": ".*(dev|Bump).*", "pr_template": "${{NUMBER}}",
"target": "$1", "label_extractor": [
"on_property": "title" {
} "pattern": ".*(dev|Bump).*",
], "target": "$1",
"base_branches": ["develop"] "on_property": "title"
}
],
"base_branches": [
"develop"
]
} }
configs_test/configuration_base_branches_main.json
+22 -17
View File
@@ -1,19 +1,24 @@
{ {
"categories": [ "categories": [
{ {
"title": "", "title": "",
"labels": ["dev", "Bump"] "labels": [
} "dev",
], "Bump"
"ignore_labels": [], ]
"sort": "DESC", }
"pr_template": "${{NUMBER}}", ],
"label_extractor": [ "ignore_labels": [],
{ "sort": "DESC",
"pattern": ".*(dev|Bump).*", "pr_template": "${{NUMBER}}",
"target": "$1", "label_extractor": [
"on_property": "title" {
} "pattern": ".*(dev|Bump).*",
], "target": "$1",
"base_branches": ["main"] "on_property": "title"
}
],
"base_branches": [
"main"
]
} }
src/releaseNotes.ts
+4 -3
View File
@@ -128,11 +128,12 @@ export class ReleaseNotes {
return commmit.sha return commmit.sha
}) })
// retrieve base branches we allow
const baseBranches = configuration.base_branches || DefaultConfiguration.base_branches
const allBaseBranchesAllowed = baseBranches.length === 0
// return only the pull requests associated with this release // return only the pull requests associated with this release
return pullRequests.filter(pr => { return pullRequests.filter(pr => {
const baseBranches = configuration.base_branches || DefaultConfiguration.base_branches
const allBaseBranchesAllowed = baseBranches.length === 0
return releaseCommitHashes.includes(pr.mergeCommitSha) return releaseCommitHashes.includes(pr.mergeCommitSha)
&& (allBaseBranchesAllowed || baseBranches.includes(pr.baseBranch)) && (allBaseBranchesAllowed || baseBranches.includes(pr.baseBranch))
}) })