From cfbb4472f3e131cb0d8e89753ccbed1dbdc3893c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1si=20Benjamin?= Date: Fri, 9 Jun 2017 14:38:00 +0200 Subject: [PATCH 01/18] Fix Readme.md typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7898a60b4..a1d9fc588 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ func main() { } ``` -By default GoReleaser will build the your current directory, but you can change the build package path in the GoReleaser configuration file. +By default GoReleaser will build the current directory, but you can change the build package path in the GoReleaser configuration file. ```yml # goreleaser.yml From 6519681ac22fdcdebdfd1012ffd8948747d50c4a Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sun, 18 Jun 2017 18:30:39 -0300 Subject: [PATCH 02/18] using goreleaser/archive --- internal/tar/tar.go | 64 ------------------------------------- internal/tar/tar_test.go | 34 -------------------- internal/zip/zip.go | 45 -------------------------- internal/zip/zip_test.go | 30 ----------------- pipeline/archive/archive.go | 15 +++------ 5 files changed, 4 insertions(+), 184 deletions(-) delete mode 100644 internal/tar/tar.go delete mode 100644 internal/tar/tar_test.go delete mode 100644 internal/zip/zip.go delete mode 100644 internal/zip/zip_test.go diff --git a/internal/tar/tar.go b/internal/tar/tar.go deleted file mode 100644 index 62edbbee3..000000000 --- a/internal/tar/tar.go +++ /dev/null @@ -1,64 +0,0 @@ -// Package tar implements the Archive interface providing tar.gz archiving -// and compression. -package tar - -import ( - "archive/tar" - "compress/gzip" - "io" - "os" -) - -// Archive as tar.gz -type Archive struct { - gw *gzip.Writer - tw *tar.Writer -} - -// Close all closeables -func (a Archive) Close() error { - if err := a.tw.Close(); err != nil { - return err - } - if err := a.gw.Close(); err != nil { - return err - } - return nil -} - -// New tar.gz archive -func New(target *os.File) Archive { - gw := gzip.NewWriter(target) - tw := tar.NewWriter(gw) - return Archive{ - gw: gw, - tw: tw, - } -} - -// Add file to the archive -func (a Archive) Add(name, path string) (err error) { - file, err := os.Open(path) - if err != nil { - return - } - defer func() { - _ = file.Close() - }() - stat, err := file.Stat() - if err != nil || stat.IsDir() { - return - } - header := new(tar.Header) - header.Name = name - header.Size = stat.Size() - header.Mode = int64(stat.Mode()) - header.ModTime = stat.ModTime() - if err := a.tw.WriteHeader(header); err != nil { - return err - } - if _, err := io.Copy(a.tw, file); err != nil { - return err - } - return -} diff --git a/internal/tar/tar_test.go b/internal/tar/tar_test.go deleted file mode 100644 index 6fa150280..000000000 --- a/internal/tar/tar_test.go +++ /dev/null @@ -1,34 +0,0 @@ -package tar - -import ( - "io/ioutil" - "os" - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestTarGzFile(t *testing.T) { - var assert = assert.New(t) - - folder, err := ioutil.TempDir("", "targztest") - assert.NoError(err) - - file, err := os.Create(folder + "/folder.tar.gz") - assert.NoError(err) - - empty, err := os.Create(folder + "/empty.txt") - assert.NoError(err) - - empty2, err := os.Create(folder + "/empty2.txt") - assert.NoError(err) - - assert.NoError(os.Mkdir(folder+"/folder-inside", 0755)) - - archive := New(file) - assert.NoError(archive.Add("empty.txt", empty.Name())) - assert.Error(archive.Add("dont.txt", empty.Name()+"_nope")) - assert.NoError(archive.Add("empty.txt", folder+"/folder-inside")) - assert.NoError(archive.Close()) - assert.Error(archive.Add("empty2.txt", empty2.Name())) -} diff --git a/internal/zip/zip.go b/internal/zip/zip.go deleted file mode 100644 index 6da32bb5d..000000000 --- a/internal/zip/zip.go +++ /dev/null @@ -1,45 +0,0 @@ -// Package zip implements the Archive interface providing zip archiving -// and compression. -package zip - -import ( - "archive/zip" - "io" - "os" -) - -// Archive zip struct -type Archive struct { - z *zip.Writer -} - -// Close all closeables -func (a Archive) Close() error { - return a.z.Close() -} - -// New zip archive -func New(target *os.File) Archive { - return Archive{ - z: zip.NewWriter(target), - } -} - -// Add a file to the zip archive -func (a Archive) Add(name, path string) (err error) { - file, err := os.Open(path) - if err != nil { - return - } - stat, err := file.Stat() - if err != nil || stat.IsDir() { - return - } - defer func() { _ = file.Close() }() - f, err := a.z.Create(name) - if err != nil { - return err - } - _, err = io.Copy(f, file) - return err -} diff --git a/internal/zip/zip_test.go b/internal/zip/zip_test.go deleted file mode 100644 index 584d93656..000000000 --- a/internal/zip/zip_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package zip - -import ( - "io/ioutil" - "os" - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestZipFile(t *testing.T) { - var assert = assert.New(t) - - folder, err := ioutil.TempDir("", "ziptest") - assert.NoError(err) - - file, err := os.Create(folder + "/folder.zip") - assert.NoError(err) - - empty, err := os.Create(folder + "/empty.txt") - assert.NoError(err) - - assert.NoError(os.Mkdir(folder+"/folder-inside", 0755)) - - archive := New(file) - assert.NoError(archive.Add("empty.txt", empty.Name())) - assert.NoError(archive.Add("empty.txt", folder+"/folder-inside")) - assert.Error(archive.Add("dont.txt", empty.Name()+"_nope")) - assert.NoError(archive.Close()) -} diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index 6cdc5234d..cb33e0cea 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -9,10 +9,9 @@ import ( "path/filepath" "strings" + "github.com/goreleaser/archive" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/internal/ext" - "github.com/goreleaser/goreleaser/internal/tar" - "github.com/goreleaser/goreleaser/internal/zip" "github.com/mattn/go-zglob" "golang.org/x/sync/errgroup" ) @@ -38,12 +37,6 @@ func (Pipe) Run(ctx *context.Context) error { return g.Wait() } -// Archive represents a compression archive files from disk can be written to. -type Archive interface { - Close() error - Add(name, path string) error -} - func create(ctx *context.Context, platform, name string) error { var folder = filepath.Join(ctx.Config.Dist, name) var format = formatFor(ctx, platform) @@ -84,11 +77,11 @@ func findFiles(ctx *context.Context) (result []string, err error) { return } -func archiveFor(file *os.File, format string) Archive { +func archiveFor(file *os.File, format string) archive.Archive { if format == "zip" { - return zip.New(file) + return archive.NewZip(file) } - return tar.New(file) + return archive.NewTargz(file) } func formatFor(ctx *context.Context, platform string) string { From ee4cbb25b8168a3336e1186a10fedb2eaf7ada8b Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sun, 18 Jun 2017 18:35:26 -0300 Subject: [PATCH 03/18] fixes --- Gopkg.lock | 8 +++++++- Gopkg.toml | 4 +++- pipeline/archive/archive.go | 9 +-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 922c164f5..db91b0134 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -25,6 +25,12 @@ packages = ["query"] revision = "53e6ce116135b80d037921a7fdd5138cf32d7a8a" +[[projects]] + name = "github.com/goreleaser/archive" + packages = [".","tar","zip"] + revision = "caa5f3f5742eb0535631e94fa5e171c74c0144b7" + version = "v1.0.0" + [[projects]] branch = "master" name = "github.com/mattn/go-zglob" @@ -82,6 +88,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "612a8c73aafb0d235fb9758a889e7a2fee0e0155d4c70cec64d544b62f329cdd" + inputs-digest = "c020d9bb377ff4b15fd8b7b2787c7c77fb854b64cb2da5ca12ff5a2311afa5f7" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 35df344ff..8d27120ca 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -64,7 +64,9 @@ ## what source location any dependent projects specify. # source = "https://github.com/myfork/package.git" - +[[constraint]] + name = "github.com/goreleaser/archive" + version = "1.0.0" [[constraint]] branch = "master" diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index cb33e0cea..88aedfb94 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -46,7 +46,7 @@ func create(ctx *context.Context, platform, name string) error { } log.Println("Creating", file.Name()) defer func() { _ = file.Close() }() - var archive = archiveFor(file, format) + var archive = archive.New(file) defer func() { _ = archive.Close() }() files, err := findFiles(ctx) @@ -77,13 +77,6 @@ func findFiles(ctx *context.Context) (result []string, err error) { return } -func archiveFor(file *os.File, format string) archive.Archive { - if format == "zip" { - return archive.NewZip(file) - } - return archive.NewTargz(file) -} - func formatFor(ctx *context.Context, platform string) string { for _, override := range ctx.Config.Archive.FormatOverrides { if strings.HasPrefix(platform, override.Goos) { From f6abdf3c2750b2978a84668b5966cdd323173624 Mon Sep 17 00:00:00 2001 From: Dominik Schulz Date: Mon, 19 Jun 2017 09:57:56 +0200 Subject: [PATCH 04/18] Add missing loop variable capture Fixes #261 --- pipeline/fpm/fpm.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pipeline/fpm/fpm.go b/pipeline/fpm/fpm.go index 70bdebbac..9f49e5f53 100644 --- a/pipeline/fpm/fpm.go +++ b/pipeline/fpm/fpm.go @@ -40,6 +40,7 @@ func (Pipe) Run(ctx *context.Context) error { var g errgroup.Group for _, format := range ctx.Config.FPM.Formats { + format := format for _, goarch := range ctx.Config.Build.Goarch { if ctx.Archives["linux"+goarch] == "" { continue From c80fc0714d6ac75461550c77f633bdf90f1fb433 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 19 Jun 2017 08:56:31 -0300 Subject: [PATCH 05/18] removed broken badge --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index a1d9fc588..728306c4f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Codecov branch Go Report Card Go Doc - SayThanks.io Powered By: GoReleaser

From 1e9e82d926be92a35be8e69e070659e3e7eecee3 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:09:14 -0300 Subject: [PATCH 06/18] apex log --- context/context.go | 4 ++-- context/context_test.go | 3 +-- goreleaserlib/goreleaser.go | 24 ++++++++---------------- goreleaserlib/goreleaser_test.go | 5 +---- internal/client/github.go | 4 ++-- main.go | 13 +++++++++---- pipeline/archive/archive.go | 4 ++-- pipeline/brew/brew.go | 10 +++++----- pipeline/build/build.go | 6 +++--- pipeline/build/target.go | 6 +++--- pipeline/checksums/checksums.go | 4 ++-- pipeline/env/env.go | 6 +++--- pipeline/fpm/fpm.go | 6 +++--- pipeline/git/git.go | 9 ++++----- pipeline/release/release.go | 10 ++++++---- 15 files changed, 54 insertions(+), 60 deletions(-) diff --git a/context/context.go b/context/context.go index dd3412d23..da9ea163a 100644 --- a/context/context.go +++ b/context/context.go @@ -8,10 +8,10 @@ package context import ( ctx "context" - "log" "strings" "sync" + "github.com/apex/log" "github.com/goreleaser/goreleaser/config" ) @@ -45,7 +45,7 @@ func (ctx *Context) AddArtifact(file string) { file = strings.TrimPrefix(file, ctx.Config.Dist) file = strings.Replace(file, "/", "", -1) ctx.Artifacts = append(ctx.Artifacts, file) - log.Println("Registered artifact", file) + log.WithField("artifact", file).Info("Registered") } // New context diff --git a/context/context_test.go b/context/context_test.go index 18b3163fd..617c81d8c 100644 --- a/context/context_test.go +++ b/context/context_test.go @@ -3,10 +3,9 @@ package context import ( "testing" - "golang.org/x/sync/errgroup" - "github.com/goreleaser/goreleaser/config" "github.com/stretchr/testify/assert" + "golang.org/x/sync/errgroup" ) func TestMultipleArtifactAdds(t *testing.T) { diff --git a/goreleaserlib/goreleaser.go b/goreleaserlib/goreleaser.go index 61c2ae9d0..6b355eced 100644 --- a/goreleaserlib/goreleaser.go +++ b/goreleaserlib/goreleaser.go @@ -1,14 +1,11 @@ package goreleaserlib import ( + "fmt" "io/ioutil" - "log" "os" - yaml "gopkg.in/yaml.v1" - - "fmt" - + "github.com/apex/log" "github.com/goreleaser/goreleaser/config" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/pipeline" @@ -21,6 +18,7 @@ import ( "github.com/goreleaser/goreleaser/pipeline/fpm" "github.com/goreleaser/goreleaser/pipeline/git" "github.com/goreleaser/goreleaser/pipeline/release" + yaml "gopkg.in/yaml.v1" ) var pipes = []pipeline.Pipe{ @@ -35,10 +33,6 @@ var pipes = []pipeline.Pipe{ brew.Pipe{}, // push to brew tap } -func init() { - log.SetFlags(0) -} - // Flags interface represents an extractor of cli flags type Flags interface { IsSet(s string) bool @@ -58,7 +52,7 @@ func Release(flags Flags) error { if !os.IsNotExist(statErr) || flags.IsSet("config") { return err } - log.Printf("WARNING: Could not load %v\n", file) + log.WithField("file", file).Warn("Could not load") } var ctx = context.New(cfg) ctx.Validate = !flags.Bool("skip-validate") @@ -68,23 +62,21 @@ func Release(flags Flags) error { if err != nil { return err } - log.Println("Loaded custom release notes from", notes) + log.WithField("notes", notes).Info("Loaded custom release notes") ctx.ReleaseNotes = string(bts) } ctx.Snapshot = flags.Bool("snapshot") if ctx.Snapshot { - log.Println("Publishing disabled in snapshot mode") + log.Info("Publishing disabled in snapshot mode") ctx.Publish = false } for _, pipe := range pipes { - log.Println(pipe.Description()) - log.SetPrefix(" -> ") + log.Infof(pipe.Description()) if err := pipe.Run(ctx); err != nil { return err } - log.SetPrefix("") } - log.Println("Done!") + log.Info("Done!") return nil } diff --git a/goreleaserlib/goreleaser_test.go b/goreleaserlib/goreleaser_test.go index cf79efc70..6cb3009e7 100644 --- a/goreleaserlib/goreleaser_test.go +++ b/goreleaserlib/goreleaser_test.go @@ -2,16 +2,14 @@ package goreleaserlib import ( "io/ioutil" - "log" "os" "os/exec" "path/filepath" "testing" - yaml "gopkg.in/yaml.v1" - "github.com/goreleaser/goreleaser/config" "github.com/stretchr/testify/assert" + yaml "gopkg.in/yaml.v1" ) func init() { @@ -146,7 +144,6 @@ func setup(t *testing.T) (current string, back func()) { var assert = assert.New(t) folder, err := ioutil.TempDir("", "goreleaser") assert.NoError(err) - log.Println("Folder:", folder) previous, err := os.Getwd() assert.NoError(err) assert.NoError(os.Chdir(folder)) diff --git a/internal/client/github.go b/internal/client/github.go index ce370cc3e..7950ef5bd 100644 --- a/internal/client/github.go +++ b/internal/client/github.go @@ -2,9 +2,9 @@ package client import ( "bytes" - "log" "os" + "github.com/apex/log" "github.com/google/go-github/github" "github.com/goreleaser/goreleaser/context" "golang.org/x/oauth2" @@ -98,7 +98,7 @@ func (c *githubClient) CreateRelease(ctx *context.Context, body string) (release data, ) } - log.Printf("Release updated: %v\n", release.GetHTMLURL()) + log.Infof("Release updated: %v\n", release.GetHTMLURL()) return release.GetID(), err } diff --git a/main.go b/main.go index 0af8bb37f..bdc5eb231 100644 --- a/main.go +++ b/main.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "log" "os" + "github.com/apex/log" + lcli "github.com/apex/log/handlers/cli" "github.com/goreleaser/goreleaser/goreleaserlib" "github.com/urfave/cli" ) @@ -15,6 +16,10 @@ var ( date = "unknown" ) +func init() { + log.SetHandler(lcli.New(os.Stdout)) +} + func main() { var app = cli.NewApp() app.Name = "goreleaser" @@ -44,7 +49,7 @@ func main() { }, } app.Action = func(c *cli.Context) error { - log.Printf("Running goreleaser %v\n", version) + log.Infof("Running goreleaser %v", version) if err := goreleaserlib.Release(c); err != nil { return cli.NewExitError(err.Error(), 1) } @@ -61,12 +66,12 @@ func main() { return cli.NewExitError(err.Error(), 1) } - log.Printf("%s created. Please edit accordingly to your needs.", filename) + log.Infof("%s created. Please edit accordingly to your needs.", filename) return nil }, }, } if err := app.Run(os.Args); err != nil { - log.Fatalln(err) + log.WithError(err).Fatal("Failed") } } diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index 6cdc5234d..fafb39b52 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -4,11 +4,11 @@ package archive import ( - "log" "os" "path/filepath" "strings" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/internal/ext" "github.com/goreleaser/goreleaser/internal/tar" @@ -51,7 +51,7 @@ func create(ctx *context.Context, platform, name string) error { if err != nil { return err } - log.Println("Creating", file.Name()) + log.WithField("archive", file.Name()).Info("Creating") defer func() { _ = file.Close() }() var archive = archiveFor(file, format) defer func() { _ = archive.Close() }() diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go index e6947cdd4..b1fb383e8 100644 --- a/pipeline/brew/brew.go +++ b/pipeline/brew/brew.go @@ -5,11 +5,11 @@ package brew import ( "bytes" "errors" - "log" "path/filepath" "strings" "text/template" + "github.com/apex/log" "github.com/goreleaser/goreleaser/checksum" "github.com/goreleaser/goreleaser/config" "github.com/goreleaser/goreleaser/context" @@ -95,19 +95,19 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Println("Skipped because --skip-publish is set") + log.Info("Skipped because --skip-publish is set") return nil } if ctx.Config.Brew.GitHub.Name == "" { - log.Println("Skipped because brew section is not configured") + log.Info("Skipped because brew section is not configured") return nil } if ctx.Config.Release.Draft { - log.Println("Skipped because release is marked as draft") + log.Info("Skipped because release is marked as draft") return nil } path := filepath.Join(ctx.Config.Brew.Folder, ctx.Config.Build.Binary+".rb") - log.Println("Pushing", path, "to", ctx.Config.Brew.GitHub.String()) + log.WithField("formula", path).WithField("repo", ctx.Config.Brew.GitHub.String()).Info("Pushing") content, err := buildFormula(ctx, client) if err != nil { return err diff --git a/pipeline/build/build.go b/pipeline/build/build.go index b1c50622e..8a17bd23f 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -4,12 +4,12 @@ package build import ( "fmt" - "log" "os" "os/exec" "path/filepath" "strings" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/internal/ext" "golang.org/x/sync/errgroup" @@ -56,7 +56,7 @@ func runHook(env []string, hook string) error { if hook == "" { return nil } - log.Println("Running hook", hook) + log.WithField("hook", hook).Info("Running hook") cmd := strings.Fields(hook) return run(runtimeTarget, cmd, env) } @@ -67,7 +67,7 @@ func build(ctx *context.Context, name string, target buildTarget) error { name, ctx.Config.Build.Binary+ext.For(target.goos), ) - log.Println("Building", output) + log.WithField("binary", output).Info("Building") cmd := []string{"go", "build"} if ctx.Config.Build.Flags != "" { cmd = append(cmd, strings.Fields(ctx.Config.Build.Flags)...) diff --git a/pipeline/build/target.go b/pipeline/build/target.go index f1c739e9c..1cad3a7e7 100644 --- a/pipeline/build/target.go +++ b/pipeline/build/target.go @@ -2,9 +2,9 @@ package build import ( "fmt" - "log" "runtime" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" ) @@ -26,11 +26,11 @@ func (t buildTarget) PrettyString() string { func buildTargets(ctx *context.Context) (targets []buildTarget) { for _, target := range allBuildTargets(ctx) { if !valid(target) { - log.Println("Skipped invalid build target:", target.PrettyString()) + log.WithField("target", target.PrettyString()).Info("Skipped invalid build") continue } if ignored(ctx, target) { - log.Println("Skipped ignored build target:", target.PrettyString()) + log.WithField("target", target.PrettyString()).Info("Skipped ignored build") continue } targets = append(targets, target) diff --git a/pipeline/checksums/checksums.go b/pipeline/checksums/checksums.go index 1a19d0c2b..18a5b9a5b 100644 --- a/pipeline/checksums/checksums.go +++ b/pipeline/checksums/checksums.go @@ -4,10 +4,10 @@ package checksums import ( "fmt" - "log" "os" "path/filepath" + "github.com/apex/log" "github.com/goreleaser/goreleaser/checksum" "github.com/goreleaser/goreleaser/context" "golang.org/x/sync/errgroup" @@ -49,7 +49,7 @@ func (Pipe) Run(ctx *context.Context) (err error) { } func checksums(ctx *context.Context, file *os.File, name string) error { - log.Println("Checksumming", name) + log.WithField("file", name).Info("Checksumming") var artifact = filepath.Join(ctx.Config.Dist, name) sha, err := checksum.SHA256(artifact) if err != nil { diff --git a/pipeline/env/env.go b/pipeline/env/env.go index 4beb2780f..bb02841ff 100644 --- a/pipeline/env/env.go +++ b/pipeline/env/env.go @@ -4,9 +4,9 @@ package env import ( "errors" - "log" "os" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" ) @@ -25,11 +25,11 @@ func (Pipe) Description() string { func (Pipe) Run(ctx *context.Context) (err error) { ctx.Token = os.Getenv("GITHUB_TOKEN") if !ctx.Publish { - log.Println("GITHUB_TOKEN not validated because publishing has been disabled") + log.Warn("GITHUB_TOKEN not validated because publishing has been disabled") return nil } if !ctx.Validate { - log.Println("Skipped validations because --skip-validate is set") + log.Warn("Skipped validations because --skip-validate is set") return nil } if ctx.Token == "" { diff --git a/pipeline/fpm/fpm.go b/pipeline/fpm/fpm.go index 9f49e5f53..dd07740d0 100644 --- a/pipeline/fpm/fpm.go +++ b/pipeline/fpm/fpm.go @@ -3,10 +3,10 @@ package fpm import ( "errors" - "log" "os/exec" "path/filepath" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" "golang.org/x/sync/errgroup" ) @@ -30,7 +30,7 @@ func (Pipe) Description() string { // Run the pipe func (Pipe) Run(ctx *context.Context) error { if len(ctx.Config.FPM.Formats) == 0 { - log.Println("No output formats configured, skipping") + log.Info("No output formats configured, skipping") return nil } _, err := exec.LookPath("fpm") @@ -59,7 +59,7 @@ func create(ctx *context.Context, format, archive, arch string) error { var path = filepath.Join(ctx.Config.Dist, archive) var file = path + "." + format var name = ctx.Config.Build.Binary - log.Println("Creating", file) + log.WithField("file", file).Info("Creating") var options = []string{ "--input-type", "dir", diff --git a/pipeline/git/git.go b/pipeline/git/git.go index 1f50b2a4d..195c00eb9 100644 --- a/pipeline/git/git.go +++ b/pipeline/git/git.go @@ -5,13 +5,12 @@ package git import ( "bytes" "fmt" - "log" "regexp" "strings" + "text/template" "time" - "text/template" - + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" ) @@ -74,7 +73,7 @@ func (Pipe) Run(ctx *context.Context) (err error) { return } if !ctx.Validate { - log.Println("Skipped validations because --skip-validate is set") + log.Warn("Skipped validations because --skip-validate is set") return nil } return validate(ctx, commit, tag) @@ -170,7 +169,7 @@ func gitLog(refs ...string) (string, error) { func getInfo() (tag, commit string, err error) { tag, err = cleanGit("describe", "--tags", "--abbrev=0") if err != nil { - log.Printf("Failed to retrieve current tag: %s", err.Error()) + log.WithError(err).Info("Failed to retrieve current tag") } commit, err = cleanGit("show", "--format='%H'", "HEAD") return diff --git a/pipeline/release/release.go b/pipeline/release/release.go index 06f011749..c81a4cdb8 100644 --- a/pipeline/release/release.go +++ b/pipeline/release/release.go @@ -3,10 +3,10 @@ package release import ( - "log" "os" "path/filepath" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/internal/client" "golang.org/x/sync/errgroup" @@ -27,10 +27,12 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Println("Skipped because --skip-publish is set") + log.Info("Skipped because --skip-publish is set") return nil } - log.Println("Creating or updating release", ctx.Git.CurrentTag, "on", ctx.Config.Release.GitHub.String()) + log.WithField("tag", ctx.Git.CurrentTag). + WithField("repo", ctx.Config.Release.GitHub.String()). + Info("Creating or updating release") body, err := describeBody(ctx) if err != nil { return err @@ -56,6 +58,6 @@ func upload(ctx *context.Context, client client.Client, releaseID int, artifact return err } defer func() { _ = file.Close() }() - log.Println("Uploading", file.Name()) + log.WithField("file", file).Info("Uploading") return client.Upload(ctx, releaseID, artifact, file) } From 0d760731a1d808f65d41880419bf46531a597edb Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:25:52 -0300 Subject: [PATCH 07/18] debug, warning etc --- goreleaserlib/goreleaser.go | 3 +++ main.go | 6 +++++- pipeline/brew/brew.go | 6 +++--- pipeline/build/build.go | 13 ++++++------- pipeline/build/target.go | 4 ++-- pipeline/release/release.go | 2 +- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/goreleaserlib/goreleaser.go b/goreleaserlib/goreleaser.go index 6b355eced..0eb45fdeb 100644 --- a/goreleaserlib/goreleaser.go +++ b/goreleaserlib/goreleaser.go @@ -44,6 +44,9 @@ type Flags interface { func Release(flags Flags) error { var file = flags.String("config") var notes = flags.String("release-notes") + if flags.Bool("debug") { + log.SetLevel(log.DebugLevel) + } cfg, err := config.Load(file) if err != nil { // Allow file not found errors if config file was not diff --git a/main.go b/main.go index bdc5eb231..036dd91f0 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "os" "github.com/apex/log" - lcli "github.com/apex/log/handlers/cli" + lcli "github.com/apex/log/handlers/text" "github.com/goreleaser/goreleaser/goreleaserlib" "github.com/urfave/cli" ) @@ -47,6 +47,10 @@ func main() { Name: "snapshot", Usage: "Generate an unversioned snapshot release", }, + cli.BoolFlag{ + Name: "debug", + Usage: "Enable debug mode", + }, } app.Action = func(c *cli.Context) error { log.Infof("Running goreleaser %v", version) diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go index b1fb383e8..88e2e0d66 100644 --- a/pipeline/brew/brew.go +++ b/pipeline/brew/brew.go @@ -95,15 +95,15 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Info("Skipped because --skip-publish is set") + log.Warn("Skipped because --skip-publish is set") return nil } if ctx.Config.Brew.GitHub.Name == "" { - log.Info("Skipped because brew section is not configured") + log.Warn("Skipped because brew section is not configured") return nil } if ctx.Config.Release.Draft { - log.Info("Skipped because release is marked as draft") + log.Warn("Skipped because release is marked as draft") return nil } path := filepath.Join(ctx.Config.Brew.Folder, ctx.Config.Build.Binary+".rb") diff --git a/pipeline/build/build.go b/pipeline/build/build.go index 8a17bd23f..4795add9e 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -81,15 +81,14 @@ func build(ctx *context.Context, name string, target buildTarget) error { } func run(target buildTarget, command, env []string) error { - cmd := exec.Command(command[0], command[1:]...) + var cmd = exec.Command(command[0], command[1:]...) + env = append(env, "GOOS="+target.goos, "GOARCH="+target.goarch, "GOARM="+target.goarm) cmd.Env = append(cmd.Env, os.Environ()...) cmd.Env = append(cmd.Env, env...) - cmd.Env = append( - cmd.Env, - "GOOS="+target.goos, - "GOARCH="+target.goarch, - "GOARM="+target.goarm, - ) + log.WithField("target", target.PrettyString()). + WithField("env", env). + WithField("args", cmd.Args). + Debug("Running") if out, err := cmd.CombinedOutput(); err != nil { return fmt.Errorf("build failed: %s\n%v", target.PrettyString(), string(out)) } diff --git a/pipeline/build/target.go b/pipeline/build/target.go index 1cad3a7e7..bbe7cfd23 100644 --- a/pipeline/build/target.go +++ b/pipeline/build/target.go @@ -26,11 +26,11 @@ func (t buildTarget) PrettyString() string { func buildTargets(ctx *context.Context) (targets []buildTarget) { for _, target := range allBuildTargets(ctx) { if !valid(target) { - log.WithField("target", target.PrettyString()).Info("Skipped invalid build") + log.WithField("target", target.PrettyString()).Warn("Skipped invalid build") continue } if ignored(ctx, target) { - log.WithField("target", target.PrettyString()).Info("Skipped ignored build") + log.WithField("target", target.PrettyString()).Warn("Skipped ignored build") continue } targets = append(targets, target) diff --git a/pipeline/release/release.go b/pipeline/release/release.go index c81a4cdb8..203f1a6bf 100644 --- a/pipeline/release/release.go +++ b/pipeline/release/release.go @@ -27,7 +27,7 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Info("Skipped because --skip-publish is set") + log.Warn("Skipped because --skip-publish is set") return nil } log.WithField("tag", ctx.Git.CurrentTag). From c05a8567a121560e41870c5fe1c2d8219c1eb014 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:38:24 -0300 Subject: [PATCH 08/18] improvements --- goreleaserlib/goreleaser.go | 5 +++-- main.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/goreleaserlib/goreleaser.go b/goreleaserlib/goreleaser.go index 0eb45fdeb..8eebf2553 100644 --- a/goreleaserlib/goreleaser.go +++ b/goreleaserlib/goreleaser.go @@ -4,6 +4,7 @@ import ( "fmt" "io/ioutil" "os" + "strings" "github.com/apex/log" "github.com/goreleaser/goreleaser/config" @@ -74,12 +75,12 @@ func Release(flags Flags) error { ctx.Publish = false } for _, pipe := range pipes { - log.Infof(pipe.Description()) + log.Infof("\033[1m%s\033[0m", strings.ToUpper(pipe.Description())) if err := pipe.Run(ctx); err != nil { return err } } - log.Info("Done!") + log.Infof("\033[1mSUCCESS!\033[0m") return nil } diff --git a/main.go b/main.go index 036dd91f0..7a68cbe6b 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "os" "github.com/apex/log" - lcli "github.com/apex/log/handlers/text" + lcli "github.com/apex/log/handlers/cli" "github.com/goreleaser/goreleaser/goreleaserlib" "github.com/urfave/cli" ) From 06202773115ee86a06c8308f2a85a8249b064f20 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:52:39 -0300 Subject: [PATCH 09/18] deps --- Gopkg.lock | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Gopkg.lock b/Gopkg.lock index 922c164f5..8c29178e5 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,6 +1,12 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +[[projects]] + branch = "master" + name = "github.com/apex/log" + packages = [".","handlers/cli"] + revision = "8f3a15d95392c8fc202d1e1059f46df21dff2992" + [[projects]] name = "github.com/davecgh/go-spew" packages = ["spew"] @@ -31,6 +37,12 @@ packages = [".","fastwalk"] revision = "95345c4e1c0ebc9d16a3284177f09360f4d20fab" +[[projects]] + name = "github.com/pkg/errors" + packages = ["."] + revision = "645ef00459ed84a119197bfb8d8205042c6df63d" + version = "v0.8.0" + [[projects]] name = "github.com/pmezard/go-difflib" packages = ["difflib"] @@ -82,6 +94,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "612a8c73aafb0d235fb9758a889e7a2fee0e0155d4c70cec64d544b62f329cdd" + inputs-digest = "d6da23d2c5d62fbc0e9d6effeeea88169d4c5add4eb620087f17af4853a41cc4" solver-name = "gps-cdcl" solver-version = 1 From 8aa55db7cf7536076e6e16bfa9a7e9db78ade721 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:52:45 -0300 Subject: [PATCH 10/18] cov --- goreleaserlib/goreleaser_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/goreleaserlib/goreleaser_test.go b/goreleaserlib/goreleaser_test.go index 6cb3009e7..486c0bca5 100644 --- a/goreleaserlib/goreleaser_test.go +++ b/goreleaserlib/goreleaser_test.go @@ -24,6 +24,7 @@ func TestRelease(t *testing.T) { flags: map[string]string{ "skip-publish": "true", "skip-validate": "true", + "debug": "true", }, } assert.NoError(Release(flags)) From b8ff8e9b1221c535ccc54160f11bd17d799a1387 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:09:14 -0300 Subject: [PATCH 11/18] apex log --- context/context.go | 4 ++-- context/context_test.go | 3 +-- goreleaserlib/goreleaser.go | 24 ++++++++---------------- goreleaserlib/goreleaser_test.go | 5 +---- internal/client/github.go | 4 ++-- main.go | 13 +++++++++---- pipeline/archive/archive.go | 4 ++-- pipeline/brew/brew.go | 10 +++++----- pipeline/build/build.go | 6 +++--- pipeline/build/target.go | 6 +++--- pipeline/checksums/checksums.go | 4 ++-- pipeline/env/env.go | 6 +++--- pipeline/fpm/fpm.go | 6 +++--- pipeline/git/git.go | 9 ++++----- pipeline/release/release.go | 10 ++++++---- 15 files changed, 54 insertions(+), 60 deletions(-) diff --git a/context/context.go b/context/context.go index dd3412d23..da9ea163a 100644 --- a/context/context.go +++ b/context/context.go @@ -8,10 +8,10 @@ package context import ( ctx "context" - "log" "strings" "sync" + "github.com/apex/log" "github.com/goreleaser/goreleaser/config" ) @@ -45,7 +45,7 @@ func (ctx *Context) AddArtifact(file string) { file = strings.TrimPrefix(file, ctx.Config.Dist) file = strings.Replace(file, "/", "", -1) ctx.Artifacts = append(ctx.Artifacts, file) - log.Println("Registered artifact", file) + log.WithField("artifact", file).Info("Registered") } // New context diff --git a/context/context_test.go b/context/context_test.go index 18b3163fd..617c81d8c 100644 --- a/context/context_test.go +++ b/context/context_test.go @@ -3,10 +3,9 @@ package context import ( "testing" - "golang.org/x/sync/errgroup" - "github.com/goreleaser/goreleaser/config" "github.com/stretchr/testify/assert" + "golang.org/x/sync/errgroup" ) func TestMultipleArtifactAdds(t *testing.T) { diff --git a/goreleaserlib/goreleaser.go b/goreleaserlib/goreleaser.go index 61c2ae9d0..6b355eced 100644 --- a/goreleaserlib/goreleaser.go +++ b/goreleaserlib/goreleaser.go @@ -1,14 +1,11 @@ package goreleaserlib import ( + "fmt" "io/ioutil" - "log" "os" - yaml "gopkg.in/yaml.v1" - - "fmt" - + "github.com/apex/log" "github.com/goreleaser/goreleaser/config" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/pipeline" @@ -21,6 +18,7 @@ import ( "github.com/goreleaser/goreleaser/pipeline/fpm" "github.com/goreleaser/goreleaser/pipeline/git" "github.com/goreleaser/goreleaser/pipeline/release" + yaml "gopkg.in/yaml.v1" ) var pipes = []pipeline.Pipe{ @@ -35,10 +33,6 @@ var pipes = []pipeline.Pipe{ brew.Pipe{}, // push to brew tap } -func init() { - log.SetFlags(0) -} - // Flags interface represents an extractor of cli flags type Flags interface { IsSet(s string) bool @@ -58,7 +52,7 @@ func Release(flags Flags) error { if !os.IsNotExist(statErr) || flags.IsSet("config") { return err } - log.Printf("WARNING: Could not load %v\n", file) + log.WithField("file", file).Warn("Could not load") } var ctx = context.New(cfg) ctx.Validate = !flags.Bool("skip-validate") @@ -68,23 +62,21 @@ func Release(flags Flags) error { if err != nil { return err } - log.Println("Loaded custom release notes from", notes) + log.WithField("notes", notes).Info("Loaded custom release notes") ctx.ReleaseNotes = string(bts) } ctx.Snapshot = flags.Bool("snapshot") if ctx.Snapshot { - log.Println("Publishing disabled in snapshot mode") + log.Info("Publishing disabled in snapshot mode") ctx.Publish = false } for _, pipe := range pipes { - log.Println(pipe.Description()) - log.SetPrefix(" -> ") + log.Infof(pipe.Description()) if err := pipe.Run(ctx); err != nil { return err } - log.SetPrefix("") } - log.Println("Done!") + log.Info("Done!") return nil } diff --git a/goreleaserlib/goreleaser_test.go b/goreleaserlib/goreleaser_test.go index cf79efc70..6cb3009e7 100644 --- a/goreleaserlib/goreleaser_test.go +++ b/goreleaserlib/goreleaser_test.go @@ -2,16 +2,14 @@ package goreleaserlib import ( "io/ioutil" - "log" "os" "os/exec" "path/filepath" "testing" - yaml "gopkg.in/yaml.v1" - "github.com/goreleaser/goreleaser/config" "github.com/stretchr/testify/assert" + yaml "gopkg.in/yaml.v1" ) func init() { @@ -146,7 +144,6 @@ func setup(t *testing.T) (current string, back func()) { var assert = assert.New(t) folder, err := ioutil.TempDir("", "goreleaser") assert.NoError(err) - log.Println("Folder:", folder) previous, err := os.Getwd() assert.NoError(err) assert.NoError(os.Chdir(folder)) diff --git a/internal/client/github.go b/internal/client/github.go index ce370cc3e..7950ef5bd 100644 --- a/internal/client/github.go +++ b/internal/client/github.go @@ -2,9 +2,9 @@ package client import ( "bytes" - "log" "os" + "github.com/apex/log" "github.com/google/go-github/github" "github.com/goreleaser/goreleaser/context" "golang.org/x/oauth2" @@ -98,7 +98,7 @@ func (c *githubClient) CreateRelease(ctx *context.Context, body string) (release data, ) } - log.Printf("Release updated: %v\n", release.GetHTMLURL()) + log.Infof("Release updated: %v\n", release.GetHTMLURL()) return release.GetID(), err } diff --git a/main.go b/main.go index 0af8bb37f..bdc5eb231 100644 --- a/main.go +++ b/main.go @@ -2,9 +2,10 @@ package main import ( "fmt" - "log" "os" + "github.com/apex/log" + lcli "github.com/apex/log/handlers/cli" "github.com/goreleaser/goreleaser/goreleaserlib" "github.com/urfave/cli" ) @@ -15,6 +16,10 @@ var ( date = "unknown" ) +func init() { + log.SetHandler(lcli.New(os.Stdout)) +} + func main() { var app = cli.NewApp() app.Name = "goreleaser" @@ -44,7 +49,7 @@ func main() { }, } app.Action = func(c *cli.Context) error { - log.Printf("Running goreleaser %v\n", version) + log.Infof("Running goreleaser %v", version) if err := goreleaserlib.Release(c); err != nil { return cli.NewExitError(err.Error(), 1) } @@ -61,12 +66,12 @@ func main() { return cli.NewExitError(err.Error(), 1) } - log.Printf("%s created. Please edit accordingly to your needs.", filename) + log.Infof("%s created. Please edit accordingly to your needs.", filename) return nil }, }, } if err := app.Run(os.Args); err != nil { - log.Fatalln(err) + log.WithError(err).Fatal("Failed") } } diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index 88aedfb94..48a560faf 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -4,11 +4,11 @@ package archive import ( - "log" "os" "path/filepath" "strings" + "github.com/apex/log" "github.com/goreleaser/archive" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/internal/ext" @@ -44,7 +44,7 @@ func create(ctx *context.Context, platform, name string) error { if err != nil { return err } - log.Println("Creating", file.Name()) + log.WithField("archive", file.Name()).Info("Creating") defer func() { _ = file.Close() }() var archive = archive.New(file) defer func() { _ = archive.Close() }() diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go index e6947cdd4..b1fb383e8 100644 --- a/pipeline/brew/brew.go +++ b/pipeline/brew/brew.go @@ -5,11 +5,11 @@ package brew import ( "bytes" "errors" - "log" "path/filepath" "strings" "text/template" + "github.com/apex/log" "github.com/goreleaser/goreleaser/checksum" "github.com/goreleaser/goreleaser/config" "github.com/goreleaser/goreleaser/context" @@ -95,19 +95,19 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Println("Skipped because --skip-publish is set") + log.Info("Skipped because --skip-publish is set") return nil } if ctx.Config.Brew.GitHub.Name == "" { - log.Println("Skipped because brew section is not configured") + log.Info("Skipped because brew section is not configured") return nil } if ctx.Config.Release.Draft { - log.Println("Skipped because release is marked as draft") + log.Info("Skipped because release is marked as draft") return nil } path := filepath.Join(ctx.Config.Brew.Folder, ctx.Config.Build.Binary+".rb") - log.Println("Pushing", path, "to", ctx.Config.Brew.GitHub.String()) + log.WithField("formula", path).WithField("repo", ctx.Config.Brew.GitHub.String()).Info("Pushing") content, err := buildFormula(ctx, client) if err != nil { return err diff --git a/pipeline/build/build.go b/pipeline/build/build.go index b1c50622e..8a17bd23f 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -4,12 +4,12 @@ package build import ( "fmt" - "log" "os" "os/exec" "path/filepath" "strings" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/internal/ext" "golang.org/x/sync/errgroup" @@ -56,7 +56,7 @@ func runHook(env []string, hook string) error { if hook == "" { return nil } - log.Println("Running hook", hook) + log.WithField("hook", hook).Info("Running hook") cmd := strings.Fields(hook) return run(runtimeTarget, cmd, env) } @@ -67,7 +67,7 @@ func build(ctx *context.Context, name string, target buildTarget) error { name, ctx.Config.Build.Binary+ext.For(target.goos), ) - log.Println("Building", output) + log.WithField("binary", output).Info("Building") cmd := []string{"go", "build"} if ctx.Config.Build.Flags != "" { cmd = append(cmd, strings.Fields(ctx.Config.Build.Flags)...) diff --git a/pipeline/build/target.go b/pipeline/build/target.go index f1c739e9c..1cad3a7e7 100644 --- a/pipeline/build/target.go +++ b/pipeline/build/target.go @@ -2,9 +2,9 @@ package build import ( "fmt" - "log" "runtime" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" ) @@ -26,11 +26,11 @@ func (t buildTarget) PrettyString() string { func buildTargets(ctx *context.Context) (targets []buildTarget) { for _, target := range allBuildTargets(ctx) { if !valid(target) { - log.Println("Skipped invalid build target:", target.PrettyString()) + log.WithField("target", target.PrettyString()).Info("Skipped invalid build") continue } if ignored(ctx, target) { - log.Println("Skipped ignored build target:", target.PrettyString()) + log.WithField("target", target.PrettyString()).Info("Skipped ignored build") continue } targets = append(targets, target) diff --git a/pipeline/checksums/checksums.go b/pipeline/checksums/checksums.go index 1a19d0c2b..18a5b9a5b 100644 --- a/pipeline/checksums/checksums.go +++ b/pipeline/checksums/checksums.go @@ -4,10 +4,10 @@ package checksums import ( "fmt" - "log" "os" "path/filepath" + "github.com/apex/log" "github.com/goreleaser/goreleaser/checksum" "github.com/goreleaser/goreleaser/context" "golang.org/x/sync/errgroup" @@ -49,7 +49,7 @@ func (Pipe) Run(ctx *context.Context) (err error) { } func checksums(ctx *context.Context, file *os.File, name string) error { - log.Println("Checksumming", name) + log.WithField("file", name).Info("Checksumming") var artifact = filepath.Join(ctx.Config.Dist, name) sha, err := checksum.SHA256(artifact) if err != nil { diff --git a/pipeline/env/env.go b/pipeline/env/env.go index 4beb2780f..bb02841ff 100644 --- a/pipeline/env/env.go +++ b/pipeline/env/env.go @@ -4,9 +4,9 @@ package env import ( "errors" - "log" "os" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" ) @@ -25,11 +25,11 @@ func (Pipe) Description() string { func (Pipe) Run(ctx *context.Context) (err error) { ctx.Token = os.Getenv("GITHUB_TOKEN") if !ctx.Publish { - log.Println("GITHUB_TOKEN not validated because publishing has been disabled") + log.Warn("GITHUB_TOKEN not validated because publishing has been disabled") return nil } if !ctx.Validate { - log.Println("Skipped validations because --skip-validate is set") + log.Warn("Skipped validations because --skip-validate is set") return nil } if ctx.Token == "" { diff --git a/pipeline/fpm/fpm.go b/pipeline/fpm/fpm.go index 9f49e5f53..dd07740d0 100644 --- a/pipeline/fpm/fpm.go +++ b/pipeline/fpm/fpm.go @@ -3,10 +3,10 @@ package fpm import ( "errors" - "log" "os/exec" "path/filepath" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" "golang.org/x/sync/errgroup" ) @@ -30,7 +30,7 @@ func (Pipe) Description() string { // Run the pipe func (Pipe) Run(ctx *context.Context) error { if len(ctx.Config.FPM.Formats) == 0 { - log.Println("No output formats configured, skipping") + log.Info("No output formats configured, skipping") return nil } _, err := exec.LookPath("fpm") @@ -59,7 +59,7 @@ func create(ctx *context.Context, format, archive, arch string) error { var path = filepath.Join(ctx.Config.Dist, archive) var file = path + "." + format var name = ctx.Config.Build.Binary - log.Println("Creating", file) + log.WithField("file", file).Info("Creating") var options = []string{ "--input-type", "dir", diff --git a/pipeline/git/git.go b/pipeline/git/git.go index 1f50b2a4d..195c00eb9 100644 --- a/pipeline/git/git.go +++ b/pipeline/git/git.go @@ -5,13 +5,12 @@ package git import ( "bytes" "fmt" - "log" "regexp" "strings" + "text/template" "time" - "text/template" - + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" ) @@ -74,7 +73,7 @@ func (Pipe) Run(ctx *context.Context) (err error) { return } if !ctx.Validate { - log.Println("Skipped validations because --skip-validate is set") + log.Warn("Skipped validations because --skip-validate is set") return nil } return validate(ctx, commit, tag) @@ -170,7 +169,7 @@ func gitLog(refs ...string) (string, error) { func getInfo() (tag, commit string, err error) { tag, err = cleanGit("describe", "--tags", "--abbrev=0") if err != nil { - log.Printf("Failed to retrieve current tag: %s", err.Error()) + log.WithError(err).Info("Failed to retrieve current tag") } commit, err = cleanGit("show", "--format='%H'", "HEAD") return diff --git a/pipeline/release/release.go b/pipeline/release/release.go index 06f011749..c81a4cdb8 100644 --- a/pipeline/release/release.go +++ b/pipeline/release/release.go @@ -3,10 +3,10 @@ package release import ( - "log" "os" "path/filepath" + "github.com/apex/log" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/internal/client" "golang.org/x/sync/errgroup" @@ -27,10 +27,12 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Println("Skipped because --skip-publish is set") + log.Info("Skipped because --skip-publish is set") return nil } - log.Println("Creating or updating release", ctx.Git.CurrentTag, "on", ctx.Config.Release.GitHub.String()) + log.WithField("tag", ctx.Git.CurrentTag). + WithField("repo", ctx.Config.Release.GitHub.String()). + Info("Creating or updating release") body, err := describeBody(ctx) if err != nil { return err @@ -56,6 +58,6 @@ func upload(ctx *context.Context, client client.Client, releaseID int, artifact return err } defer func() { _ = file.Close() }() - log.Println("Uploading", file.Name()) + log.WithField("file", file).Info("Uploading") return client.Upload(ctx, releaseID, artifact, file) } From f2bd9b4b0d7bfad5ec7c078113590c2941017926 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:25:52 -0300 Subject: [PATCH 12/18] debug, warning etc --- goreleaserlib/goreleaser.go | 3 +++ main.go | 6 +++++- pipeline/brew/brew.go | 6 +++--- pipeline/build/build.go | 13 ++++++------- pipeline/build/target.go | 4 ++-- pipeline/release/release.go | 2 +- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/goreleaserlib/goreleaser.go b/goreleaserlib/goreleaser.go index 6b355eced..0eb45fdeb 100644 --- a/goreleaserlib/goreleaser.go +++ b/goreleaserlib/goreleaser.go @@ -44,6 +44,9 @@ type Flags interface { func Release(flags Flags) error { var file = flags.String("config") var notes = flags.String("release-notes") + if flags.Bool("debug") { + log.SetLevel(log.DebugLevel) + } cfg, err := config.Load(file) if err != nil { // Allow file not found errors if config file was not diff --git a/main.go b/main.go index bdc5eb231..036dd91f0 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "os" "github.com/apex/log" - lcli "github.com/apex/log/handlers/cli" + lcli "github.com/apex/log/handlers/text" "github.com/goreleaser/goreleaser/goreleaserlib" "github.com/urfave/cli" ) @@ -47,6 +47,10 @@ func main() { Name: "snapshot", Usage: "Generate an unversioned snapshot release", }, + cli.BoolFlag{ + Name: "debug", + Usage: "Enable debug mode", + }, } app.Action = func(c *cli.Context) error { log.Infof("Running goreleaser %v", version) diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go index b1fb383e8..88e2e0d66 100644 --- a/pipeline/brew/brew.go +++ b/pipeline/brew/brew.go @@ -95,15 +95,15 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Info("Skipped because --skip-publish is set") + log.Warn("Skipped because --skip-publish is set") return nil } if ctx.Config.Brew.GitHub.Name == "" { - log.Info("Skipped because brew section is not configured") + log.Warn("Skipped because brew section is not configured") return nil } if ctx.Config.Release.Draft { - log.Info("Skipped because release is marked as draft") + log.Warn("Skipped because release is marked as draft") return nil } path := filepath.Join(ctx.Config.Brew.Folder, ctx.Config.Build.Binary+".rb") diff --git a/pipeline/build/build.go b/pipeline/build/build.go index 8a17bd23f..4795add9e 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -81,15 +81,14 @@ func build(ctx *context.Context, name string, target buildTarget) error { } func run(target buildTarget, command, env []string) error { - cmd := exec.Command(command[0], command[1:]...) + var cmd = exec.Command(command[0], command[1:]...) + env = append(env, "GOOS="+target.goos, "GOARCH="+target.goarch, "GOARM="+target.goarm) cmd.Env = append(cmd.Env, os.Environ()...) cmd.Env = append(cmd.Env, env...) - cmd.Env = append( - cmd.Env, - "GOOS="+target.goos, - "GOARCH="+target.goarch, - "GOARM="+target.goarm, - ) + log.WithField("target", target.PrettyString()). + WithField("env", env). + WithField("args", cmd.Args). + Debug("Running") if out, err := cmd.CombinedOutput(); err != nil { return fmt.Errorf("build failed: %s\n%v", target.PrettyString(), string(out)) } diff --git a/pipeline/build/target.go b/pipeline/build/target.go index 1cad3a7e7..bbe7cfd23 100644 --- a/pipeline/build/target.go +++ b/pipeline/build/target.go @@ -26,11 +26,11 @@ func (t buildTarget) PrettyString() string { func buildTargets(ctx *context.Context) (targets []buildTarget) { for _, target := range allBuildTargets(ctx) { if !valid(target) { - log.WithField("target", target.PrettyString()).Info("Skipped invalid build") + log.WithField("target", target.PrettyString()).Warn("Skipped invalid build") continue } if ignored(ctx, target) { - log.WithField("target", target.PrettyString()).Info("Skipped ignored build") + log.WithField("target", target.PrettyString()).Warn("Skipped ignored build") continue } targets = append(targets, target) diff --git a/pipeline/release/release.go b/pipeline/release/release.go index c81a4cdb8..203f1a6bf 100644 --- a/pipeline/release/release.go +++ b/pipeline/release/release.go @@ -27,7 +27,7 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Info("Skipped because --skip-publish is set") + log.Warn("Skipped because --skip-publish is set") return nil } log.WithField("tag", ctx.Git.CurrentTag). From 0df05f02a46e30a7847a139d2870dd64d970bc02 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:38:24 -0300 Subject: [PATCH 13/18] improvements --- goreleaserlib/goreleaser.go | 5 +++-- main.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/goreleaserlib/goreleaser.go b/goreleaserlib/goreleaser.go index 0eb45fdeb..8eebf2553 100644 --- a/goreleaserlib/goreleaser.go +++ b/goreleaserlib/goreleaser.go @@ -4,6 +4,7 @@ import ( "fmt" "io/ioutil" "os" + "strings" "github.com/apex/log" "github.com/goreleaser/goreleaser/config" @@ -74,12 +75,12 @@ func Release(flags Flags) error { ctx.Publish = false } for _, pipe := range pipes { - log.Infof(pipe.Description()) + log.Infof("\033[1m%s\033[0m", strings.ToUpper(pipe.Description())) if err := pipe.Run(ctx); err != nil { return err } } - log.Info("Done!") + log.Infof("\033[1mSUCCESS!\033[0m") return nil } diff --git a/main.go b/main.go index 036dd91f0..7a68cbe6b 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ import ( "os" "github.com/apex/log" - lcli "github.com/apex/log/handlers/text" + lcli "github.com/apex/log/handlers/cli" "github.com/goreleaser/goreleaser/goreleaserlib" "github.com/urfave/cli" ) From 8fb2f2ddde44a13fe6fbf0164ead9d94b2684aed Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:52:39 -0300 Subject: [PATCH 14/18] deps --- Gopkg.lock | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Gopkg.lock b/Gopkg.lock index db91b0134..0c723ea05 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,6 +1,12 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +[[projects]] + branch = "master" + name = "github.com/apex/log" + packages = [".","handlers/cli"] + revision = "8f3a15d95392c8fc202d1e1059f46df21dff2992" + [[projects]] name = "github.com/davecgh/go-spew" packages = ["spew"] @@ -37,6 +43,12 @@ packages = [".","fastwalk"] revision = "95345c4e1c0ebc9d16a3284177f09360f4d20fab" +[[projects]] + name = "github.com/pkg/errors" + packages = ["."] + revision = "645ef00459ed84a119197bfb8d8205042c6df63d" + version = "v0.8.0" + [[projects]] name = "github.com/pmezard/go-difflib" packages = ["difflib"] @@ -88,6 +100,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "c020d9bb377ff4b15fd8b7b2787c7c77fb854b64cb2da5ca12ff5a2311afa5f7" + inputs-digest = "d6da23d2c5d62fbc0e9d6effeeea88169d4c5add4eb620087f17af4853a41cc4" solver-name = "gps-cdcl" solver-version = 1 From 0fb6a36b236f066bb7760ed946ce3b26fc088a39 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 00:52:45 -0300 Subject: [PATCH 15/18] cov --- goreleaserlib/goreleaser_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/goreleaserlib/goreleaser_test.go b/goreleaserlib/goreleaser_test.go index 6cb3009e7..486c0bca5 100644 --- a/goreleaserlib/goreleaser_test.go +++ b/goreleaserlib/goreleaser_test.go @@ -24,6 +24,7 @@ func TestRelease(t *testing.T) { flags: map[string]string{ "skip-publish": "true", "skip-validate": "true", + "debug": "true", }, } assert.NoError(Release(flags)) From 1a26940490f0c60dd1f7f632fd793929f10ba723 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 10:36:43 -0300 Subject: [PATCH 16/18] merge --- Gopkg.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gopkg.lock b/Gopkg.lock index 0c723ea05..93ed8b013 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -100,6 +100,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "d6da23d2c5d62fbc0e9d6effeeea88169d4c5add4eb620087f17af4853a41cc4" + inputs-digest = "15a60b1efa147cc2507589fd45e4b767e118c6853c6ae2e2728a6ba01b818fe4" solver-name = "gps-cdcl" solver-version = 1 From bd70d5ef42be4e98e2ee0ebda7bf2a8cdf7c0ce6 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 10:47:34 -0300 Subject: [PATCH 17/18] improved some logs --- context/context.go | 2 +- goreleaserlib/goreleaser.go | 6 +++--- internal/client/github.go | 2 +- main.go | 7 ++++--- pipeline/archive/archive.go | 2 +- pipeline/brew/brew.go | 10 ++++++---- pipeline/build/build.go | 6 +++--- pipeline/build/target.go | 6 ++++-- pipeline/checksums/checksums.go | 2 +- pipeline/env/env.go | 4 ++-- pipeline/fpm/fpm.go | 2 +- pipeline/git/git.go | 4 ++-- pipeline/release/release.go | 6 +++--- 13 files changed, 32 insertions(+), 27 deletions(-) diff --git a/context/context.go b/context/context.go index da9ea163a..c3d6541e7 100644 --- a/context/context.go +++ b/context/context.go @@ -45,7 +45,7 @@ func (ctx *Context) AddArtifact(file string) { file = strings.TrimPrefix(file, ctx.Config.Dist) file = strings.Replace(file, "/", "", -1) ctx.Artifacts = append(ctx.Artifacts, file) - log.WithField("artifact", file).Info("Registered") + log.WithField("artifact", file).Info("registered") } // New context diff --git a/goreleaserlib/goreleaser.go b/goreleaserlib/goreleaser.go index 8eebf2553..e3b924815 100644 --- a/goreleaserlib/goreleaser.go +++ b/goreleaserlib/goreleaser.go @@ -56,7 +56,7 @@ func Release(flags Flags) error { if !os.IsNotExist(statErr) || flags.IsSet("config") { return err } - log.WithField("file", file).Warn("Could not load") + log.WithField("file", file).Warn("could not load config") } var ctx = context.New(cfg) ctx.Validate = !flags.Bool("skip-validate") @@ -66,12 +66,12 @@ func Release(flags Flags) error { if err != nil { return err } - log.WithField("notes", notes).Info("Loaded custom release notes") + log.WithField("notes", notes).Info("loaded custom release notes") ctx.ReleaseNotes = string(bts) } ctx.Snapshot = flags.Bool("snapshot") if ctx.Snapshot { - log.Info("Publishing disabled in snapshot mode") + log.Info("publishing disabled in snapshot mode") ctx.Publish = false } for _, pipe := range pipes { diff --git a/internal/client/github.go b/internal/client/github.go index 7950ef5bd..738904a1a 100644 --- a/internal/client/github.go +++ b/internal/client/github.go @@ -98,7 +98,7 @@ func (c *githubClient) CreateRelease(ctx *context.Context, body string) (release data, ) } - log.Infof("Release updated: %v\n", release.GetHTMLURL()) + log.WithField("url", release.GetHTMLURL()).Info("release updated") return release.GetID(), err } diff --git a/main.go b/main.go index 7a68cbe6b..47d9a43a7 100644 --- a/main.go +++ b/main.go @@ -53,7 +53,7 @@ func main() { }, } app.Action = func(c *cli.Context) error { - log.Infof("Running goreleaser %v", version) + log.Infof("running goreleaser %v", version) if err := goreleaserlib.Release(c); err != nil { return cli.NewExitError(err.Error(), 1) } @@ -70,12 +70,13 @@ func main() { return cli.NewExitError(err.Error(), 1) } - log.Infof("%s created. Please edit accordingly to your needs.", filename) + log.WithField("file", filename). + Info("config create, please edit accordingly to your needs") return nil }, }, } if err := app.Run(os.Args); err != nil { - log.WithError(err).Fatal("Failed") + log.WithError(err).Fatal("failed") } } diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index fafb39b52..7381629b4 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -51,7 +51,7 @@ func create(ctx *context.Context, platform, name string) error { if err != nil { return err } - log.WithField("archive", file.Name()).Info("Creating") + log.WithField("archive", file.Name()).Info("creating") defer func() { _ = file.Close() }() var archive = archiveFor(file, format) defer func() { _ = archive.Close() }() diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go index 88e2e0d66..fb385793e 100644 --- a/pipeline/brew/brew.go +++ b/pipeline/brew/brew.go @@ -95,19 +95,21 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Warn("Skipped because --skip-publish is set") + log.Warn("skipped because --skip-publish is set") return nil } if ctx.Config.Brew.GitHub.Name == "" { - log.Warn("Skipped because brew section is not configured") + log.Warn("skipped because brew section is not configured") return nil } if ctx.Config.Release.Draft { - log.Warn("Skipped because release is marked as draft") + log.Warn("skipped because release is marked as draft") return nil } path := filepath.Join(ctx.Config.Brew.Folder, ctx.Config.Build.Binary+".rb") - log.WithField("formula", path).WithField("repo", ctx.Config.Brew.GitHub.String()).Info("Pushing") + log.WithField("formula", path). + WithField("repo", ctx.Config.Brew.GitHub.String()). + Info("pushing") content, err := buildFormula(ctx, client) if err != nil { return err diff --git a/pipeline/build/build.go b/pipeline/build/build.go index 4795add9e..e5a59f30f 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -56,7 +56,7 @@ func runHook(env []string, hook string) error { if hook == "" { return nil } - log.WithField("hook", hook).Info("Running hook") + log.WithField("hook", hook).Info("running hook") cmd := strings.Fields(hook) return run(runtimeTarget, cmd, env) } @@ -67,7 +67,7 @@ func build(ctx *context.Context, name string, target buildTarget) error { name, ctx.Config.Build.Binary+ext.For(target.goos), ) - log.WithField("binary", output).Info("Building") + log.WithField("binary", output).Info("building") cmd := []string{"go", "build"} if ctx.Config.Build.Flags != "" { cmd = append(cmd, strings.Fields(ctx.Config.Build.Flags)...) @@ -88,7 +88,7 @@ func run(target buildTarget, command, env []string) error { log.WithField("target", target.PrettyString()). WithField("env", env). WithField("args", cmd.Args). - Debug("Running") + Debug("running") if out, err := cmd.CombinedOutput(); err != nil { return fmt.Errorf("build failed: %s\n%v", target.PrettyString(), string(out)) } diff --git a/pipeline/build/target.go b/pipeline/build/target.go index bbe7cfd23..1bdce6894 100644 --- a/pipeline/build/target.go +++ b/pipeline/build/target.go @@ -26,11 +26,13 @@ func (t buildTarget) PrettyString() string { func buildTargets(ctx *context.Context) (targets []buildTarget) { for _, target := range allBuildTargets(ctx) { if !valid(target) { - log.WithField("target", target.PrettyString()).Warn("Skipped invalid build") + log.WithField("target", target.PrettyString()). + Warn("skipped invalid build") continue } if ignored(ctx, target) { - log.WithField("target", target.PrettyString()).Warn("Skipped ignored build") + log.WithField("target", target.PrettyString()). + Warn("skipped ignored build") continue } targets = append(targets, target) diff --git a/pipeline/checksums/checksums.go b/pipeline/checksums/checksums.go index 18a5b9a5b..abf33b39a 100644 --- a/pipeline/checksums/checksums.go +++ b/pipeline/checksums/checksums.go @@ -49,7 +49,7 @@ func (Pipe) Run(ctx *context.Context) (err error) { } func checksums(ctx *context.Context, file *os.File, name string) error { - log.WithField("file", name).Info("Checksumming") + log.WithField("file", name).Info("checksumming") var artifact = filepath.Join(ctx.Config.Dist, name) sha, err := checksum.SHA256(artifact) if err != nil { diff --git a/pipeline/env/env.go b/pipeline/env/env.go index bb02841ff..65ee81711 100644 --- a/pipeline/env/env.go +++ b/pipeline/env/env.go @@ -25,11 +25,11 @@ func (Pipe) Description() string { func (Pipe) Run(ctx *context.Context) (err error) { ctx.Token = os.Getenv("GITHUB_TOKEN") if !ctx.Publish { - log.Warn("GITHUB_TOKEN not validated because publishing has been disabled") + log.Warn("github token not validated because publishing has been disabled") return nil } if !ctx.Validate { - log.Warn("Skipped validations because --skip-validate is set") + log.Warn("skipped validations because --skip-validate is set") return nil } if ctx.Token == "" { diff --git a/pipeline/fpm/fpm.go b/pipeline/fpm/fpm.go index dd07740d0..b859826d0 100644 --- a/pipeline/fpm/fpm.go +++ b/pipeline/fpm/fpm.go @@ -30,7 +30,7 @@ func (Pipe) Description() string { // Run the pipe func (Pipe) Run(ctx *context.Context) error { if len(ctx.Config.FPM.Formats) == 0 { - log.Info("No output formats configured, skipping") + log.Info("no output formats configured, skipping") return nil } _, err := exec.LookPath("fpm") diff --git a/pipeline/git/git.go b/pipeline/git/git.go index 195c00eb9..c96d9ce0f 100644 --- a/pipeline/git/git.go +++ b/pipeline/git/git.go @@ -73,7 +73,7 @@ func (Pipe) Run(ctx *context.Context) (err error) { return } if !ctx.Validate { - log.Warn("Skipped validations because --skip-validate is set") + log.Warn("skipped validations because --skip-validate is set") return nil } return validate(ctx, commit, tag) @@ -169,7 +169,7 @@ func gitLog(refs ...string) (string, error) { func getInfo() (tag, commit string, err error) { tag, err = cleanGit("describe", "--tags", "--abbrev=0") if err != nil { - log.WithError(err).Info("Failed to retrieve current tag") + log.WithError(err).Info("failed to retrieve current tag") } commit, err = cleanGit("show", "--format='%H'", "HEAD") return diff --git a/pipeline/release/release.go b/pipeline/release/release.go index 203f1a6bf..1e4ccfaaa 100644 --- a/pipeline/release/release.go +++ b/pipeline/release/release.go @@ -27,12 +27,12 @@ func (Pipe) Run(ctx *context.Context) error { func doRun(ctx *context.Context, client client.Client) error { if !ctx.Publish { - log.Warn("Skipped because --skip-publish is set") + log.Warn("skipped because --skip-publish is set") return nil } log.WithField("tag", ctx.Git.CurrentTag). WithField("repo", ctx.Config.Release.GitHub.String()). - Info("Creating or updating release") + Info("creating or updating release") body, err := describeBody(ctx) if err != nil { return err @@ -58,6 +58,6 @@ func upload(ctx *context.Context, client client.Client, releaseID int, artifact return err } defer func() { _ = file.Close() }() - log.WithField("file", file).Info("Uploading") + log.WithField("file", file.Name()).Info("uploading") return client.Upload(ctx, releaseID, artifact, file) } From c2a8a5c8c572fb3948a7f144b81ac2887ab22286 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Thu, 22 Jun 2017 11:08:35 -0300 Subject: [PATCH 18/18] dep update --- Gopkg.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gopkg.lock b/Gopkg.lock index 0c723ea05..93ed8b013 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -100,6 +100,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "d6da23d2c5d62fbc0e9d6effeeea88169d4c5add4eb620087f17af4853a41cc4" + inputs-digest = "15a60b1efa147cc2507589fd45e4b767e118c6853c6ae2e2728a6ba01b818fe4" solver-name = "gps-cdcl" solver-version = 1