Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce option which allows to ignore draft releases #15

Merged
merged 2 commits into from
Dec 12, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,17 @@ In this case, use `-e` command line option to extract some release tags by regul
changelog-from-release -e '^v\d+\.\d+\.\d+$' > CHANGELOG.md
```

### How to ignore draft releases?

If you're using the GitHub Action and don't want draft releases to be included in the changelog, you can use the `-d` flag to omit them:

```yaml
- uses: rhysd/changelog-from-release/action@v3
with:
file: CHANGELOG.md
github_token: ${{ secrets.GITHUB_TOKEN }}
args: -d=false
```

## Reference auto linking

Expand Down
17 changes: 12 additions & 5 deletions changelog.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,23 @@ type ChangeLog struct {
repoURL string
out io.Writer
level int
drafts bool
ignore *regexp.Regexp
extract *regexp.Regexp
}

func (cl *ChangeLog) filterReleases(rels []*github.RepositoryRelease) []*github.RepositoryRelease {
if cl.ignore == nil && cl.extract == nil {
if cl.drafts && cl.ignore == nil && cl.extract == nil {
return rels
}

i := 0
for i < len(rels) {
t := rels[i].GetTagName()
if cl.ignore != nil && cl.ignore.MatchString(t) || cl.extract != nil && !cl.extract.MatchString(t) {
r := rels[i]
t := r.GetTagName()
if !cl.drafts && r.GetDraft() ||
cl.ignore != nil && cl.ignore.MatchString(t) ||
cl.extract != nil && !cl.extract.MatchString(t) {
rels = append(rels[:i], rels[i+1:]...)
} else {
i++
Expand All @@ -47,6 +51,9 @@ func (cl *ChangeLog) filterReleases(rels []*github.RepositoryRelease) []*github.
// Generate generates changelog text from given releases and outputs it to its writer
func (cl *ChangeLog) Generate(rels []*github.RepositoryRelease) error {
rels = cl.filterReleases(rels)
if len(rels) == 0 {
fail(fmt.Errorf("no releases to process, all filtered out"))
}
paescuj marked this conversation as resolved.
Show resolved Hide resolved

out := bufio.NewWriter(cl.out)
heading := strings.Repeat("#", cl.level)
Expand Down Expand Up @@ -111,8 +118,8 @@ func (cl *ChangeLog) Generate(rels []*github.RepositoryRelease) error {
}

// NewChangeLog creates a new ChangeLog instance
func NewChangeLog(w io.Writer, u *url.URL, l int, i, e *regexp.Regexp) *ChangeLog {
func NewChangeLog(w io.Writer, u *url.URL, l int, d bool, i, e *regexp.Regexp) *ChangeLog {
// Strip credentials in the repository URL (#9)
u.User = nil
return &ChangeLog{strings.TrimSuffix(u.String(), ".git"), w, l, i, e}
return &ChangeLog{strings.TrimSuffix(u.String(), ".git"), w, l, d, i, e}
}
3 changes: 2 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ func main() {
flag.Usage = usage
ver := flag.Bool("v", false, "Output version to stdout")
heading := flag.Int("l", 1, "Heading level of each release section")
drafts := flag.Bool("d", true, "Include draft releases")
ignore := flag.String("i", "", "Pattern to ignore release tags in regular expression")
extract := flag.String("e", "", "Pattern to extract release tags in regular expression")
flag.Parse()
Expand Down Expand Up @@ -84,7 +85,7 @@ func main() {
fail(fmt.Errorf("no release was found at %s", url))
}

cl := NewChangeLog(os.Stdout, url, *heading, reIgnore, reExtract)
cl := NewChangeLog(os.Stdout, url, *heading, *drafts, reIgnore, reExtract)

if err := cl.Generate(rels); err != nil {
fail(err)
Expand Down