Compare commits
No commits in common. "main" and "0.7.0" have entirely different histories.
@ -30,7 +30,7 @@ steps:
|
|||||||
from_secret: docker_username
|
from_secret: docker_username
|
||||||
password:
|
password:
|
||||||
from_secret: docker_password
|
from_secret: docker_password
|
||||||
- image: gitea.dikurium.ch/innopeak/drone-gitea-release:0.7
|
- image: gitea.dikurium.ch/innopeak/drone-gitea-release:0.6
|
||||||
name: create release
|
name: create release
|
||||||
settings:
|
settings:
|
||||||
gitea_password:
|
gitea_password:
|
||||||
|
54
CHANGELOG.md
54
CHANGELOG.md
@ -1,57 +1,3 @@
|
|||||||
## 0.13.0 (2024-10-25)
|
|
||||||
|
|
||||||
### Feat
|
|
||||||
|
|
||||||
- :sparkles: use time.Time.Before() instead of Sub()
|
|
||||||
|
|
||||||
## 0.12.0 (2024-10-25)
|
|
||||||
|
|
||||||
### Feat
|
|
||||||
|
|
||||||
- :sparkles: use tagger.when to find latest tag
|
|
||||||
|
|
||||||
## 0.11.1 (2024-07-11)
|
|
||||||
|
|
||||||
### Fix
|
|
||||||
|
|
||||||
- :bug: append newline after success message, use logger [CI SKIP]
|
|
||||||
|
|
||||||
## 0.11.0 (2024-07-11)
|
|
||||||
|
|
||||||
### Feat
|
|
||||||
|
|
||||||
- :sparkles: use log.textformatter
|
|
||||||
|
|
||||||
## 0.10.1 (2024-07-11)
|
|
||||||
|
|
||||||
### Fix
|
|
||||||
|
|
||||||
- revert: :rewind: fix: 🐛 use latest instead of last (oldest) tag - Add logs
|
|
||||||
|
|
||||||
## 0.10.0 (2024-07-11)
|
|
||||||
|
|
||||||
### Feat
|
|
||||||
|
|
||||||
- :loud_sound: add logs
|
|
||||||
|
|
||||||
## 0.9.0 (2024-07-11)
|
|
||||||
|
|
||||||
### Feat
|
|
||||||
|
|
||||||
- :sparkles: add support for adaptive cards
|
|
||||||
|
|
||||||
## 0.8.1 (2024-07-11)
|
|
||||||
|
|
||||||
### Fix
|
|
||||||
|
|
||||||
- :bug: use latest instead of last (oldest) tag
|
|
||||||
|
|
||||||
## 0.8.0 (2024-07-03)
|
|
||||||
|
|
||||||
### Feat
|
|
||||||
|
|
||||||
- :sparkles: add git username and password options for http
|
|
||||||
|
|
||||||
## 0.7.0 (2024-07-03)
|
## 0.7.0 (2024-07-03)
|
||||||
|
|
||||||
### Feat
|
### Feat
|
||||||
|
25
card.json
25
card.json
@ -1,25 +0,0 @@
|
|||||||
{
|
|
||||||
"type": "AdaptiveCard",
|
|
||||||
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
|
|
||||||
"version": "1.5",
|
|
||||||
"body": [
|
|
||||||
{
|
|
||||||
"type": "TextBlock",
|
|
||||||
"text": "${title}",
|
|
||||||
"wrap": true,
|
|
||||||
"style": "heading"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "TextBlock",
|
|
||||||
"text": "Tag: ${tag}",
|
|
||||||
"wrap": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"actions": [
|
|
||||||
{
|
|
||||||
"type": "Action.OpenUrl",
|
|
||||||
"title": "View release",
|
|
||||||
"url": "${url}"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,25 +0,0 @@
|
|||||||
{
|
|
||||||
"type": "AdaptiveCard",
|
|
||||||
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
|
|
||||||
"version": "1.6",
|
|
||||||
"body": [
|
|
||||||
{
|
|
||||||
"type": "TextBlock",
|
|
||||||
"text": "Publish Adaptive Card Schema",
|
|
||||||
"wrap": true,
|
|
||||||
"style": "heading"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "TextBlock",
|
|
||||||
"text": "Tag: 1.0.0",
|
|
||||||
"wrap": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"actions": [
|
|
||||||
{
|
|
||||||
"type": "Action.OpenUrl",
|
|
||||||
"title": "View release",
|
|
||||||
"url": "https://google.com"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
2
cz.yaml
2
cz.yaml
@ -5,5 +5,5 @@ commitizen:
|
|||||||
name: cz_conventional_commits
|
name: cz_conventional_commits
|
||||||
tag_format: $version
|
tag_format: $version
|
||||||
update_changelog_on_bump: true
|
update_changelog_on_bump: true
|
||||||
version: 0.13.0
|
version: 0.7.0
|
||||||
version_scheme: semver
|
version_scheme: semver
|
||||||
|
34
main.go
34
main.go
@ -6,7 +6,7 @@ import (
|
|||||||
"gitea.dikurium.ch/InnoPeak/drone-gitea-release/plugin"
|
"gitea.dikurium.ch/InnoPeak/drone-gitea-release/plugin"
|
||||||
|
|
||||||
"github.com/kelseyhightower/envconfig"
|
"github.com/kelseyhightower/envconfig"
|
||||||
log "github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
|
||||||
flag "github.com/spf13/pflag"
|
flag "github.com/spf13/pflag"
|
||||||
)
|
)
|
||||||
@ -15,7 +15,7 @@ var args plugin.Args
|
|||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
if err := envconfig.Process("", &args); err != nil {
|
if err := envconfig.Process("", &args); err != nil {
|
||||||
log.Fatalln(err)
|
logrus.Fatalln(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -24,7 +24,6 @@ func init() {
|
|||||||
tagRegex *string = flag.String("tag-regex", "", "Regex pattern to look for tag in tag-file")
|
tagRegex *string = flag.String("tag-regex", "", "Regex pattern to look for tag in tag-file")
|
||||||
notes *string = flag.String("notes", "", "Notes to use in release")
|
notes *string = flag.String("notes", "", "Notes to use in release")
|
||||||
notesFile *string = flag.String("notes-file", "", "File to use for release notes")
|
notesFile *string = flag.String("notes-file", "", "File to use for release notes")
|
||||||
logLevel *string = flag.String("log-level", "", "Level for logging")
|
|
||||||
)
|
)
|
||||||
|
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
@ -48,25 +47,34 @@ func init() {
|
|||||||
if notesFile != nil && *notesFile != "" {
|
if notesFile != nil && *notesFile != "" {
|
||||||
args.NotesFile = *notesFile
|
args.NotesFile = *notesFile
|
||||||
}
|
}
|
||||||
|
|
||||||
if logLevel != nil && *logLevel != "" {
|
|
||||||
args.Level = *logLevel
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
log.SetFormatter(&log.TextFormatter{
|
logrus.SetFormatter(new(formatter))
|
||||||
DisableTimestamp: true,
|
|
||||||
})
|
|
||||||
|
|
||||||
switch args.Level {
|
switch args.Level {
|
||||||
case "debug":
|
case "debug":
|
||||||
log.SetLevel(log.DebugLevel)
|
logrus.SetFormatter(textFormatter)
|
||||||
|
logrus.SetLevel(logrus.DebugLevel)
|
||||||
case "trace":
|
case "trace":
|
||||||
log.SetLevel(log.TraceLevel)
|
logrus.SetFormatter(textFormatter)
|
||||||
|
logrus.SetLevel(logrus.TraceLevel)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := plugin.Exec(context.Background(), args); err != nil {
|
if err := plugin.Exec(context.Background(), args); err != nil {
|
||||||
log.Fatalln(err)
|
logrus.Fatalln(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// default formatter that writes logs without including timestamp
|
||||||
|
// or level information.
|
||||||
|
type formatter struct{}
|
||||||
|
|
||||||
|
func (*formatter) Format(entry *logrus.Entry) ([]byte, error) {
|
||||||
|
return []byte(entry.Message), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// text formatter that writes logs with level information
|
||||||
|
var textFormatter = &logrus.TextFormatter{
|
||||||
|
DisableTimestamp: true,
|
||||||
|
}
|
||||||
|
@ -9,7 +9,6 @@ import (
|
|||||||
"text/template"
|
"text/template"
|
||||||
|
|
||||||
"code.gitea.io/sdk/gitea"
|
"code.gitea.io/sdk/gitea"
|
||||||
log "github.com/sirupsen/logrus"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -27,8 +26,6 @@ type Args struct {
|
|||||||
GiteaUrl string `envconfig:"PLUGIN_GITEA_URL"`
|
GiteaUrl string `envconfig:"PLUGIN_GITEA_URL"`
|
||||||
GiteaUsername string `envconfig:"PLUGIN_GITEA_USERNAME"`
|
GiteaUsername string `envconfig:"PLUGIN_GITEA_USERNAME"`
|
||||||
GiteaPassword string `envconfig:"PLUGIN_GITEA_PASSWORD"`
|
GiteaPassword string `envconfig:"PLUGIN_GITEA_PASSWORD"`
|
||||||
GitUsername string `envconfig:"PLUGIN_GIT_USERNAME"`
|
|
||||||
GitPassword string `envconfig:"PLUGIN_GIT_PASSWORD"`
|
|
||||||
Owner string `envconfig:"PLUGIN_OWNER"`
|
Owner string `envconfig:"PLUGIN_OWNER"`
|
||||||
Repo string `envconfig:"PLUGIN_REPO"`
|
Repo string `envconfig:"PLUGIN_REPO"`
|
||||||
TitleFormat string `envconfig:"PLUGIN_TITLE_FORMAT"`
|
TitleFormat string `envconfig:"PLUGIN_TITLE_FORMAT"`
|
||||||
@ -42,12 +39,6 @@ type Args struct {
|
|||||||
FetchGitTags bool `envconfig:"PLUGIN_FETCH_GIT_TAGS" default:"true"`
|
FetchGitTags bool `envconfig:"PLUGIN_FETCH_GIT_TAGS" default:"true"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ReleaseCard struct {
|
|
||||||
Title string
|
|
||||||
Tag string
|
|
||||||
Url string
|
|
||||||
}
|
|
||||||
|
|
||||||
type TitleTemplateCtx struct {
|
type TitleTemplateCtx struct {
|
||||||
Tag string
|
Tag string
|
||||||
GiteaUrl string
|
GiteaUrl string
|
||||||
@ -72,7 +63,7 @@ func Exec(ctx context.Context, args Args) error {
|
|||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if os.IsNotExist(err) && args.SkipIfNoNotesFile {
|
if os.IsNotExist(err) && args.SkipIfNoNotesFile {
|
||||||
log.Info("No notes file found, skipping release")
|
fmt.Println("No notes file found, skipping release")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return fmt.Errorf("error reading notes file %w", err)
|
return fmt.Errorf("error reading notes file %w", err)
|
||||||
@ -85,22 +76,15 @@ func Exec(ctx context.Context, args Args) error {
|
|||||||
|
|
||||||
if args.UseLatestGitTag {
|
if args.UseLatestGitTag {
|
||||||
var options = make([]GetLatestGitTagOption, 0)
|
var options = make([]GetLatestGitTagOption, 0)
|
||||||
if args.GitUsername != "" && args.GitPassword != "" {
|
|
||||||
options = append(options, SetBasicAuth(args.GitUsername, args.GitPassword))
|
|
||||||
}
|
|
||||||
if args.FetchGitTags {
|
if args.FetchGitTags {
|
||||||
options = append(options, FetchTags())
|
options = append(options, FetchTags)
|
||||||
}
|
}
|
||||||
tag, err = getLatestGitTag(options...)
|
tag, err = getLatestGitTag(options...)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("error getting git tag %w", err)
|
return fmt.Errorf("error getting git tag %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
log.WithField("tag", tag).Info("Fetched latest git tag")
|
|
||||||
} else if args.TagFile != "" {
|
} else if args.TagFile != "" {
|
||||||
log.WithField("file", args.TagFile).Info("Reading tag from file")
|
|
||||||
|
|
||||||
var pattern = defaultTagRegex
|
var pattern = defaultTagRegex
|
||||||
if args.TagRegex != "" {
|
if args.TagRegex != "" {
|
||||||
pattern = regexp.MustCompile(args.TagRegex)
|
pattern = regexp.MustCompile(args.TagRegex)
|
||||||
@ -123,8 +107,6 @@ func Exec(ctx context.Context, args Args) error {
|
|||||||
tag = matches[i]
|
tag = matches[i]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log.WithField("tag", tag).Info("Found tag")
|
|
||||||
} else {
|
} else {
|
||||||
return fmt.Errorf("latest git tag or tag file must be given")
|
return fmt.Errorf("latest git tag or tag file must be given")
|
||||||
}
|
}
|
||||||
@ -149,11 +131,6 @@ func Exec(ctx context.Context, args Args) error {
|
|||||||
|
|
||||||
title = titleBuffer.String()
|
title = titleBuffer.String()
|
||||||
|
|
||||||
log.WithFields(log.Fields{
|
|
||||||
"template": titleTmpl.DefinedTemplates(),
|
|
||||||
"title": title,
|
|
||||||
}).Info("Generated title with template")
|
|
||||||
|
|
||||||
client, err := gitea.NewClient(args.GiteaUrl, gitea.SetBasicAuth(args.GiteaUsername, args.GiteaPassword))
|
client, err := gitea.NewClient(args.GiteaUrl, gitea.SetBasicAuth(args.GiteaUsername, args.GiteaPassword))
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -172,17 +149,7 @@ func Exec(ctx context.Context, args Args) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
releaseURL := fmt.Sprintf("%s/%s/%s/releases/tag/%s", args.GiteaUrl, args.Owner, args.Repo, release.TagName)
|
releaseURL := fmt.Sprintf("%s/%s/%s/releases/tag/%s", args.GiteaUrl, args.Owner, args.Repo, release.TagName)
|
||||||
log.WithField("url", releaseURL).Info("Successfully created release")
|
fmt.Printf("Successfully created release at %s", releaseURL)
|
||||||
|
|
||||||
writeCard(
|
|
||||||
args.Pipeline.Card.Path,
|
|
||||||
"https://gitea.dikurium.ch/InnoPeak/drone-gitea-release/raw/branch/main/card.json",
|
|
||||||
ReleaseCard{
|
|
||||||
Title: title,
|
|
||||||
Tag: tag,
|
|
||||||
Url: releaseURL,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -9,87 +9,46 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
|
||||||
"os"
|
"os"
|
||||||
"time"
|
"strings"
|
||||||
|
|
||||||
"github.com/go-git/go-git/v5"
|
"github.com/go-git/go-git/v5"
|
||||||
"github.com/go-git/go-git/v5/plumbing/transport/client"
|
|
||||||
githttp "github.com/go-git/go-git/v5/plumbing/transport/http"
|
|
||||||
log "github.com/sirupsen/logrus"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type GetLatestGitTagOption func(repo *git.Repository) error
|
type GetLatestGitTagOption func(repo *git.Repository) error
|
||||||
|
|
||||||
type BasicAuthTransport struct {
|
var FetchTags = func(repo *git.Repository) error {
|
||||||
Username string
|
err := repo.Fetch(&git.FetchOptions{Tags: git.AllTags})
|
||||||
Password string
|
|
||||||
RoundTriper http.RoundTripper
|
|
||||||
}
|
|
||||||
|
|
||||||
func (bat BasicAuthTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
|
|
||||||
creds := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", bat.Username, bat.Password)))
|
|
||||||
req.Header.Set("Authorization", fmt.Sprintf("Basic %s", creds))
|
|
||||||
return bat.RoundTriper.RoundTrip(req)
|
|
||||||
}
|
|
||||||
|
|
||||||
func SetBasicAuth(username, password string) func(repo *git.Repository) error {
|
|
||||||
return func(repo *git.Repository) error {
|
|
||||||
log.Println("Configuring basic auth for https")
|
|
||||||
|
|
||||||
customClient := &http.Client{
|
|
||||||
Transport: BasicAuthTransport{username, password, http.DefaultTransport},
|
|
||||||
}
|
|
||||||
|
|
||||||
// Override http(s) default protocol to use our custom client
|
|
||||||
client.InstallProtocol("https", githttp.NewClient(customClient))
|
|
||||||
|
|
||||||
|
if err == git.NoErrAlreadyUpToDate {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func FetchTags() func(repo *git.Repository) error {
|
func getLatestGitTag(options ...GetLatestGitTagOption) (tag string, err error) {
|
||||||
return func(repo *git.Repository) error {
|
r, err := git.PlainOpen(".")
|
||||||
log.Info("Fetching git tags")
|
|
||||||
|
|
||||||
err := repo.Fetch(&git.FetchOptions{Tags: git.AllTags})
|
|
||||||
|
|
||||||
if err == git.NoErrAlreadyUpToDate {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func getLatestGitTag(options ...GetLatestGitTagOption) (string, error) {
|
|
||||||
var (
|
|
||||||
tag string
|
|
||||||
tagDate *time.Time
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
|
|
||||||
repo, err := git.PlainOpen(".")
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("error opening git repo at %s: %w", ".", err)
|
return "", fmt.Errorf("error opening git repo at %s: %w", ".", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, opt := range options {
|
for _, opt := range options {
|
||||||
err := opt(repo)
|
err := opt(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tags, err := repo.TagObjects()
|
tagRefs, err := r.Tags()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("error getting git tags %w", err)
|
return "", fmt.Errorf("error getting git tag refs %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
for {
|
for {
|
||||||
t, err := tags.Next()
|
r, err := tagRefs.Next()
|
||||||
|
|
||||||
if err == io.EOF {
|
if err == io.EOF {
|
||||||
break
|
break
|
||||||
@ -99,19 +58,15 @@ func getLatestGitTag(options ...GetLatestGitTagOption) (string, error) {
|
|||||||
return "", fmt.Errorf("error iterating tags %w", err)
|
return "", fmt.Errorf("error iterating tags %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if tagDate != nil && t.Tagger.When.Before(*tagDate) {
|
parts := strings.Split(string(r.Name()), "/")
|
||||||
continue
|
tag = strings.Join(parts[2:], "/")
|
||||||
}
|
|
||||||
|
|
||||||
tagDate = &t.Tagger.When
|
|
||||||
tag = t.Name
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if tag == "" {
|
if tag == "" {
|
||||||
return tag, fmt.Errorf("couldn't find any git tags")
|
return tag, fmt.Errorf("couldn't find any git tags")
|
||||||
}
|
}
|
||||||
|
|
||||||
return tag, err
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeCard(path, schema string, card interface{}) {
|
func writeCard(path, schema string, card interface{}) {
|
||||||
|
Loading…
Reference in New Issue
Block a user