Skip to content

Commit

Permalink
Improve tag message #8
Browse files Browse the repository at this point in the history
Add some cleanup
  • Loading branch information
skos-ninja authored Oct 16, 2021
2 parents 9536a5c + be6d151 commit eb8b5bb
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 21 deletions.
2 changes: 0 additions & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import (
)

type App interface {
GetZen(ctx context.Context) (string, error)

HandleWebhook(ctx context.Context, pr *github.PullRequestEvent) error
}

Expand Down
29 changes: 25 additions & 4 deletions app/create_tag.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,21 @@ import (
"context"
"fmt"
"log"
"strings"

"github.com/google/go-github/v35/github"
)

func createTag(ctx context.Context, client *github.Client, repoOwner, repoName, commit, version, repoURL string, prNumber int) error {
func createTag(ctx context.Context, client *github.Client, repoOwner, repoName, commit, version string, prNumber int) error {
message, err := getTagMessage(ctx, client, repoOwner, repoName, prNumber)
if err != nil {
return handleError(err)
}

tag := &github.Tag{
Tag: &version,
SHA: &commit,
Message: github.String(""),
Message: github.String(message),
Object: &github.GitObject{
Type: github.String("commit"),
SHA: &commit,
Expand All @@ -33,8 +39,23 @@ func createTag(ctx context.Context, client *github.Client, repoOwner, repoName,
return handleError(err)
}

tagURL := fmt.Sprintf("%s/releases/tag/%s", repoURL, version)
commentBody := fmt.Sprintf("[%s](%s) created on %s", version, tagURL, commit)
commentBody := fmt.Sprintf("[%s](../releases/tag/%s) created on %s", version, version, commit)
err = createComment(ctx, client, prNumber, repoOwner, repoName, commentBody)
return err
}

func getTagMessage(ctx context.Context, client *github.Client, repoOwner, repoName string, prNumber int) (string, error) {
var message strings.Builder
commits, _, err := client.PullRequests.ListCommits(ctx, repoOwner, repoName, prNumber, &github.ListOptions{})
if err != nil {
return "", err
}
message.WriteString("release_notes:\n")
for _, commit := range commits {
if cm := commit.Commit.GetMessage(); cm != "" {
message.WriteString(fmt.Sprintf(" - [%s] %s\n", commit.GetSHA()[:9], cm))
}
}

return message.String(), nil
}
12 changes: 0 additions & 12 deletions app/get_app_id.go

This file was deleted.

2 changes: 1 addition & 1 deletion app/handle_closed.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func handleClosed(ctx context.Context, client *github.Client, prEvent *github.Pu
return err
}

err = createTag(ctx, client, repoOwner, repoName, commitSHA, versionNum, repo.GetHTMLURL(), pr.GetNumber())
err = createTag(ctx, client, repoOwner, repoName, commitSHA, versionNum, pr.GetNumber())
if err != nil {
commentBody := fmt.Sprintf("Failed to make tag: `%s`", err.Error())
createComment(ctx, client, pr.GetNumber(), repoOwner, repoName, commentBody)
Expand Down
2 changes: 1 addition & 1 deletion app/handle_labeled.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func handleLabeled(ctx context.Context, client *github.Client, prEvent *github.P

commitSHA := head.GetSHA()
prNum := pr.GetNumber()
err = createTag(ctx, client, repoOwner, repoName, commitSHA, versionNum, repo.GetHTMLURL(), prNum)
err = createTag(ctx, client, repoOwner, repoName, commitSHA, versionNum, prNum)
if err != nil {
return err
}
Expand Down
1 change: 0 additions & 1 deletion pkg/version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ func TestPatchVersion(t *testing.T) {
}

func TestPreVersion(t *testing.T) {

nextVersion, err := FindNextVersion(Prerelease, v)
if err != nil {
t.Error(err)
Expand Down

0 comments on commit eb8b5bb

Please sign in to comment.