diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 99c37bce7..7fe7b8e67 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,18 +1,13 @@ [bumpversion] current_version = 1.5.0a1 -# `parse` allows parsing the version into the parts we need to check. There are some -# unnamed groups and that's okay because they do not need to be audited. If any part -# of the version passed and does not match the regex, it will fail. -# expected matches: `1.5.0`, `1.5.0a1`, `1.5.0a1.dev123457+nightly` -# excepted failures: `1`, `1.5`, `1.5.2-a1`, `text1.5.0` parse = (?P[\d]+) # major version number \.(?P[\d]+) # minor version number \.(?P[\d]+) # patch version number (((?Pa|b|rc) # optional pre-release type ?(?P[\d]+?)) # optional pre-release version number \.?(?P[a-z0-9]+\+[a-z]+)? # optional nightly release indicator - )? + )? # expected matches: `1.5.0`, `1.5.0a1`, `1.5.0a1.dev123457+nightly`, expected failures: `1`, `1.5`, `1.5.2-a1`, `text1.5.0` serialize = {major}.{minor}.{patch}{prekind}{num}.{nightly} {major}.{minor}.{patch}{prekind}{num} diff --git a/.changie.yaml b/.changie.yaml index 7b961180e..620305ac4 100644 --- a/.changie.yaml +++ b/.changie.yaml @@ -4,6 +4,7 @@ headerPath: header.tpl.md versionHeaderPath: "" changelogPath: CHANGELOG.md versionExt: md +envPrefix: "CHANGIE_" versionFormat: '## dbt-redshift {{.Version}} - {{.Time.Format "January 02, 2006"}}' kindFormat: '### {{.Kind}}' changeFormat: |- @@ -77,15 +78,21 @@ custom: footerFormat: | {{- $contributorDict := dict }} - {{- /* any names added to this list should be all lowercase for later matching purposes */}} - {{- $core_team := list "michelleark" "peterallenwebb" "emmyoop" "nathaniel-may" "gshank" "leahwicz" "chenyulinx" "stu-k" "iknox-fa" "versusfacit" "mcknight-42" "jtcohen6" "aranke" "dependabot[bot]" "snyk-bot" "colin-rogers-dbt" }} + {{- /* ensure all names in this list are all lowercase for later matching purposes */}} + {{- $core_team := splitList " " .Env.CORE_TEAM }} + {{- /* ensure we always skip snyk and dependabot in addition to the core team */}} + {{- $maintainers := list "dependabot[bot]" "snyk-bot"}} + {{- range $team_member := $core_team }} + {{- $team_member_lower := lower $team_member }} + {{- $maintainers = append $maintainers $team_member_lower }} + {{- end }} {{- range $change := .Changes }} {{- $authorList := splitList " " $change.Custom.Author }} {{- /* loop through all authors for a single changelog */}} {{- range $author := $authorList }} {{- $authorLower := lower $author }} {{- /* we only want to include non-core team contributors */}} - {{- if not (has $authorLower $core_team)}} + {{- if not (has $authorLower $maintainers)}} {{- $changeList := splitList " " $change.Custom.Author }} {{- $IssueList := list }} {{- $changeLink := $change.Kind }}