From 454abc9a0a722591afdd0f6a9e1c7cc7134d101b Mon Sep 17 00:00:00 2001 From: Jorin Vogel Date: Mon, 5 Jun 2017 16:38:59 +0200 Subject: [PATCH 01/15] Add option to skip archive. See #243. Upload binaries directly instead of creating archive. This option, however currently doesn't work together with brew and fpm since they both require archived artifacts. --- README.md | 6 +++++ config/config.go | 1 + pipeline/archive/archive.go | 10 +++++++++ pipeline/archive/archive_test.go | 38 ++++++++++++++++++++++++++++++++ pipeline/brew/brew.go | 4 ++++ pipeline/build/build.go | 3 +++ pipeline/fpm/fpm.go | 4 ++++ 7 files changed, 66 insertions(+) diff --git a/README.md b/README.md index 7898a60b4..e4ff897d0 100644 --- a/README.md +++ b/README.md @@ -250,6 +250,12 @@ build: ```yml # goreleaser.yml archive: + # If set, no archives are created and the binaries are instead uploaded directly. + # In that case name_template is used to name the binary + # and the below specified files are ignored. + # Default is false + skip: true + # You can change the name of the archive. # This is parsed with Golang template engine and the following variables # are available: diff --git a/config/config.go b/config/config.go index 1db76a004..baf9af937 100644 --- a/config/config.go +++ b/config/config.go @@ -67,6 +67,7 @@ type FormatOverride struct { // Archive config used for the archive type Archive struct { + Skip bool `yaml:",omitempty"` Format string `yaml:",omitempty"` FormatOverrides []FormatOverride `yaml:"format_overrides,omitempty"` NameTemplate string `yaml:"name_template,omitempty"` diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index 6cdc5234d..cc78814db 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -32,6 +32,9 @@ func (Pipe) Run(ctx *context.Context) error { archive := archive platform := platform g.Go(func() error { + if ctx.Config.Archive.Skip { + return skip(ctx, platform, archive) + } return create(ctx, platform, archive) }) } @@ -73,6 +76,13 @@ func create(ctx *context.Context, platform, name string) error { return nil } +func skip(ctx *context.Context, platform, name string) error { + log.Println("Skip archiving") + var binary = filepath.Join(ctx.Config.Dist, name+ext.For(platform)) + ctx.AddArtifact(binary) + return nil +} + func findFiles(ctx *context.Context) (result []string, err error) { for _, glob := range ctx.Config.Archive.Files { files, err := zglob.Glob(glob) diff --git a/pipeline/archive/archive_test.go b/pipeline/archive/archive_test.go index fc4797ab2..de3c273be 100644 --- a/pipeline/archive/archive_test.go +++ b/pipeline/archive/archive_test.go @@ -65,6 +65,44 @@ func TestRunPipe(t *testing.T) { } } +func TestRunPipeSkip(t *testing.T) { + var assert = assert.New(t) + folder, err := ioutil.TempDir("", "archivetest") + assert.NoError(err) + current, err := os.Getwd() + assert.NoError(err) + assert.NoError(os.Chdir(folder)) + defer func() { + assert.NoError(os.Chdir(current)) + }() + var dist = filepath.Join(folder, "dist") + assert.NoError(os.Mkdir(dist, 0755)) + assert.NoError(os.Mkdir(filepath.Join(dist, "mybin"), 0755)) + _, err = os.Create(filepath.Join(dist, "mybin", "mybin")) + assert.NoError(err) + _, err = os.Create(filepath.Join(dist, "mybin", "mybin.exe")) + assert.NoError(err) + _, err = os.Create(filepath.Join(folder, "README.md")) + assert.NoError(err) + var ctx = &context.Context{ + Archives: map[string]string{ + "darwinamd64": "mybin", + "windowsamd64": "mybin", + }, + Config: config.Project{ + Dist: dist, + Build: config.Build{ + Binary: "mybin", + }, + Archive: config.Archive{ + Skip: true, + }, + }, + } + assert.NoError(Pipe{}.Run(ctx)) + assert.Equal([]string{"mybin.exe", "mybin"}, ctx.Artifacts) +} + func TestRunPipeDistRemoved(t *testing.T) { var assert = assert.New(t) var ctx = &context.Context{ diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go index e6947cdd4..b9858b2db 100644 --- a/pipeline/brew/brew.go +++ b/pipeline/brew/brew.go @@ -106,6 +106,10 @@ func doRun(ctx *context.Context, client client.Client) error { log.Println("Skipped because release is marked as draft") return nil } + if ctx.Config.Archive.Skip { + log.Println("Skipped because archiving is skipped") + return nil + } path := filepath.Join(ctx.Config.Brew.Folder, ctx.Config.Build.Binary+".rb") log.Println("Pushing", path, "to", ctx.Config.Brew.GitHub.String()) content, err := buildFormula(ctx, client) diff --git a/pipeline/build/build.go b/pipeline/build/build.go index b1c50622e..c57806d25 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -67,6 +67,9 @@ func build(ctx *context.Context, name string, target buildTarget) error { name, ctx.Config.Build.Binary+ext.For(target.goos), ) + if ctx.Config.Archive.Skip { + output = filepath.Join(ctx.Config.Dist, name+ext.For(target.goos)) + } log.Println("Building", output) cmd := []string{"go", "build"} if ctx.Config.Build.Flags != "" { diff --git a/pipeline/fpm/fpm.go b/pipeline/fpm/fpm.go index 70bdebbac..cd0ce8fc5 100644 --- a/pipeline/fpm/fpm.go +++ b/pipeline/fpm/fpm.go @@ -33,6 +33,10 @@ func (Pipe) Run(ctx *context.Context) error { log.Println("No output formats configured, skipping") return nil } + if ctx.Config.Archive.Skip { + log.Println("Skipped because archiving is skipped") + return nil + } _, err := exec.LookPath("fpm") if err != nil { return ErrNoFPM From de2b5f438599ed301e64c1022e30dd1ba031af7d Mon Sep 17 00:00:00 2001 From: Jorin Vogel Date: Mon, 5 Jun 2017 18:28:29 +0200 Subject: [PATCH 02/15] Improve test coverage for archive skip option. --- pipeline/brew/brew_test.go | 14 ++++++++++++++ pipeline/build/build_test.go | 29 +++++++++++++++++++++++++++++ pipeline/fpm/fpm_test.go | 12 ++++++++++++ 3 files changed, 55 insertions(+) diff --git a/pipeline/brew/brew_test.go b/pipeline/brew/brew_test.go index 2da710082..025255018 100644 --- a/pipeline/brew/brew_test.go +++ b/pipeline/brew/brew_test.go @@ -186,6 +186,20 @@ func TestRunPipeDraftRelease(t *testing.T) { assert.False(client.CreatedFile) } +func TestRunPipeSkipArchive(t *testing.T) { + assert := assert.New(t) + var ctx = &context.Context{ + Config: config.Project{ + Archive: config.Archive{ + Skip: true, + }, + }, + } + client := &DummyClient{} + assert.NoError(doRun(ctx, client)) + assert.False(client.CreatedFile) +} + type DummyClient struct { CreatedFile bool } diff --git a/pipeline/build/build_test.go b/pipeline/build/build_test.go index 3053e4a4b..8743663de 100644 --- a/pipeline/build/build_test.go +++ b/pipeline/build/build_test.go @@ -76,6 +76,35 @@ func TestRunFullPipe(t *testing.T) { assert.True(exists(post), post) } +func TestRunPipeSkipArchive(t *testing.T) { + assert := assert.New(t) + folder, err := ioutil.TempDir("", "goreleasertest") + assert.NoError(err) + var binary = filepath.Join(folder, "binary-testing") + var config = config.Project{ + Dist: folder, + Build: config.Build{ + Binary: "testing", + Goos: []string{ + runtime.GOOS, + }, + Goarch: []string{ + runtime.GOARCH, + }, + }, + Archive: config.Archive{ + Skip: true, + NameTemplate: "binary-{{.Binary}}", + }, + } + var ctx = &context.Context{ + Config: config, + Archives: map[string]string{}, + } + assert.NoError(Pipe{}.Run(ctx)) + assert.True(exists(binary)) +} + func TestRunPipeArmBuilds(t *testing.T) { assert := assert.New(t) folder, err := ioutil.TempDir("", "goreleasertest") diff --git a/pipeline/fpm/fpm_test.go b/pipeline/fpm/fpm_test.go index 49f0ca59e..60f1a5f8c 100644 --- a/pipeline/fpm/fpm_test.go +++ b/pipeline/fpm/fpm_test.go @@ -23,6 +23,18 @@ func TestRunPipeNoFormats(t *testing.T) { assert.NoError(Pipe{}.Run(ctx)) } +func TestRunPipeSkipArchive(t *testing.T) { + var assert = assert.New(t) + var ctx = &context.Context{ + Config: config.Project{ + Archive: config.Archive{ + Skip: true, + }, + }, + } + assert.NoError(Pipe{}.Run(ctx)) +} + func TestRunPipe(t *testing.T) { var assert = assert.New(t) folder, err := ioutil.TempDir("", "archivetest") From 415e4e0334fa6c491811af82e42a92752b24ef1f Mon Sep 17 00:00:00 2001 From: Jorin Vogel Date: Mon, 5 Jun 2017 19:21:33 +0200 Subject: [PATCH 03/15] Log name of skipped archive binary. Make tests consistent. --- pipeline/archive/archive.go | 5 +++-- pipeline/archive/archive_test.go | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index cc78814db..24ee355c1 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -77,8 +77,9 @@ func create(ctx *context.Context, platform, name string) error { } func skip(ctx *context.Context, platform, name string) error { - log.Println("Skip archiving") - var binary = filepath.Join(ctx.Config.Dist, name+ext.For(platform)) + b := name + ext.For(platform) + log.Printf("Skip archiving for binary %s", b) + var binary = filepath.Join(ctx.Config.Dist, b) ctx.AddArtifact(binary) return nil } diff --git a/pipeline/archive/archive_test.go b/pipeline/archive/archive_test.go index de3c273be..959732743 100644 --- a/pipeline/archive/archive_test.go +++ b/pipeline/archive/archive_test.go @@ -100,7 +100,9 @@ func TestRunPipeSkip(t *testing.T) { }, } assert.NoError(Pipe{}.Run(ctx)) - assert.Equal([]string{"mybin.exe", "mybin"}, ctx.Artifacts) + assert.Contains(ctx.Artifacts, "mybin") + assert.Contains(ctx.Artifacts, "mybin.exe") + assert.Len(ctx.Artifacts, 2) } func TestRunPipeDistRemoved(t *testing.T) { From 24c50d804be157d6bb98627060e5a30e4386a424 Mon Sep 17 00:00:00 2001 From: Jorin Vogel Date: Thu, 8 Jun 2017 11:41:09 +0200 Subject: [PATCH 04/15] Use format: binary to skip archive instead of a separate skip: true option. --- README.md | 10 +++------- config/config.go | 1 - pipeline/archive/archive.go | 2 +- pipeline/archive/archive_test.go | 4 ++-- pipeline/brew/brew.go | 4 ++-- pipeline/brew/brew_test.go | 4 ++-- pipeline/build/build.go | 2 +- pipeline/build/build_test.go | 4 ++-- pipeline/fpm/fpm.go | 4 ++-- pipeline/fpm/fpm_test.go | 4 ++-- 10 files changed, 17 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e4ff897d0..c68c90a12 100644 --- a/README.md +++ b/README.md @@ -250,12 +250,6 @@ build: ```yml # goreleaser.yml archive: - # If set, no archives are created and the binaries are instead uploaded directly. - # In that case name_template is used to name the binary - # and the below specified files are ignored. - # Default is false - skip: true - # You can change the name of the archive. # This is parsed with Golang template engine and the following variables # are available: @@ -268,7 +262,9 @@ archive: # The default is `{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}` name_template: "{{.Binary}}_{{.Version}}_{{.Os}}_{{.Arch}}" - # Archive format. Valid options are `tar.gz` and `zip`. + # Archive format. Valid options are `tar.gz`, `zip` and `binary`. + # If format is `binary` no archives are created and the binaries are instead uploaded directly. + # In that case name_template the below specified files are ignored. # Default is `tar.gz` format: zip diff --git a/config/config.go b/config/config.go index baf9af937..1db76a004 100644 --- a/config/config.go +++ b/config/config.go @@ -67,7 +67,6 @@ type FormatOverride struct { // Archive config used for the archive type Archive struct { - Skip bool `yaml:",omitempty"` Format string `yaml:",omitempty"` FormatOverrides []FormatOverride `yaml:"format_overrides,omitempty"` NameTemplate string `yaml:"name_template,omitempty"` diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index 24ee355c1..81eac530b 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -32,7 +32,7 @@ func (Pipe) Run(ctx *context.Context) error { archive := archive platform := platform g.Go(func() error { - if ctx.Config.Archive.Skip { + if ctx.Config.Archive.Format == "binary" { return skip(ctx, platform, archive) } return create(ctx, platform, archive) diff --git a/pipeline/archive/archive_test.go b/pipeline/archive/archive_test.go index 959732743..1cbb2eaf6 100644 --- a/pipeline/archive/archive_test.go +++ b/pipeline/archive/archive_test.go @@ -65,7 +65,7 @@ func TestRunPipe(t *testing.T) { } } -func TestRunPipeSkip(t *testing.T) { +func TestRunPipeBinary(t *testing.T) { var assert = assert.New(t) folder, err := ioutil.TempDir("", "archivetest") assert.NoError(err) @@ -95,7 +95,7 @@ func TestRunPipeSkip(t *testing.T) { Binary: "mybin", }, Archive: config.Archive{ - Skip: true, + Format: "binary", }, }, } diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go index b9858b2db..a2e9eee53 100644 --- a/pipeline/brew/brew.go +++ b/pipeline/brew/brew.go @@ -106,8 +106,8 @@ func doRun(ctx *context.Context, client client.Client) error { log.Println("Skipped because release is marked as draft") return nil } - if ctx.Config.Archive.Skip { - log.Println("Skipped because archiving is skipped") + if ctx.Config.Archive.Format == "binary" { + log.Println("Skipped because archive format is binary") return nil } path := filepath.Join(ctx.Config.Brew.Folder, ctx.Config.Build.Binary+".rb") diff --git a/pipeline/brew/brew_test.go b/pipeline/brew/brew_test.go index 025255018..a0a4326fe 100644 --- a/pipeline/brew/brew_test.go +++ b/pipeline/brew/brew_test.go @@ -186,12 +186,12 @@ func TestRunPipeDraftRelease(t *testing.T) { assert.False(client.CreatedFile) } -func TestRunPipeSkipArchive(t *testing.T) { +func TestRunPipeFormatBinary(t *testing.T) { assert := assert.New(t) var ctx = &context.Context{ Config: config.Project{ Archive: config.Archive{ - Skip: true, + Format: "binary", }, }, } diff --git a/pipeline/build/build.go b/pipeline/build/build.go index c57806d25..e87cb335e 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -67,7 +67,7 @@ func build(ctx *context.Context, name string, target buildTarget) error { name, ctx.Config.Build.Binary+ext.For(target.goos), ) - if ctx.Config.Archive.Skip { + if ctx.Config.Archive.Format == "binary" { output = filepath.Join(ctx.Config.Dist, name+ext.For(target.goos)) } log.Println("Building", output) diff --git a/pipeline/build/build_test.go b/pipeline/build/build_test.go index 8743663de..d86170fb9 100644 --- a/pipeline/build/build_test.go +++ b/pipeline/build/build_test.go @@ -76,7 +76,7 @@ func TestRunFullPipe(t *testing.T) { assert.True(exists(post), post) } -func TestRunPipeSkipArchive(t *testing.T) { +func TestRunPipeFormatBinary(t *testing.T) { assert := assert.New(t) folder, err := ioutil.TempDir("", "goreleasertest") assert.NoError(err) @@ -93,7 +93,7 @@ func TestRunPipeSkipArchive(t *testing.T) { }, }, Archive: config.Archive{ - Skip: true, + Format: "binary", NameTemplate: "binary-{{.Binary}}", }, } diff --git a/pipeline/fpm/fpm.go b/pipeline/fpm/fpm.go index cd0ce8fc5..771919841 100644 --- a/pipeline/fpm/fpm.go +++ b/pipeline/fpm/fpm.go @@ -33,8 +33,8 @@ func (Pipe) Run(ctx *context.Context) error { log.Println("No output formats configured, skipping") return nil } - if ctx.Config.Archive.Skip { - log.Println("Skipped because archiving is skipped") + if ctx.Config.Archive.Format == "binary" { + log.Println("Skipped because archive format is binary") return nil } _, err := exec.LookPath("fpm") diff --git a/pipeline/fpm/fpm_test.go b/pipeline/fpm/fpm_test.go index 60f1a5f8c..156d07104 100644 --- a/pipeline/fpm/fpm_test.go +++ b/pipeline/fpm/fpm_test.go @@ -23,12 +23,12 @@ func TestRunPipeNoFormats(t *testing.T) { assert.NoError(Pipe{}.Run(ctx)) } -func TestRunPipeSkipArchive(t *testing.T) { +func TestRunPipeFormatBinary(t *testing.T) { var assert = assert.New(t) var ctx = &context.Context{ Config: config.Project{ Archive: config.Archive{ - Skip: true, + Format: "binary", }, }, } From 295c7356f1c20822ba3efb43863fdb8a512e9e76 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Fri, 23 Jun 2017 19:47:08 -0300 Subject: [PATCH 05/15] logs update --- pipeline/archive/archive.go | 2 +- pipeline/brew/brew.go | 2 +- pipeline/build/build.go | 2 +- pipeline/fpm/fpm.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index 102fc772b..b0da0eaa7 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -71,7 +71,7 @@ func create(ctx *context.Context, platform, name string) error { func skip(ctx *context.Context, platform, name string) error { b := name + ext.For(platform) - log.Printf("Skip archiving for binary %s", b) + log.WithField("binary", b).Info("skip archiving") var binary = filepath.Join(ctx.Config.Dist, b) ctx.AddArtifact(binary) return nil diff --git a/pipeline/brew/brew.go b/pipeline/brew/brew.go index ff408819e..5796e96b5 100644 --- a/pipeline/brew/brew.go +++ b/pipeline/brew/brew.go @@ -107,7 +107,7 @@ func doRun(ctx *context.Context, client client.Client) error { return nil } if ctx.Config.Archive.Format == "binary" { - log.Println("Skipped because archive format is binary") + log.Info("skipped because archive format is binary") 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 643229c0d..bf21e2ff4 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -70,7 +70,7 @@ func build(ctx *context.Context, name string, target buildTarget) error { if ctx.Config.Archive.Format == "binary" { output = filepath.Join(ctx.Config.Dist, name+ext.For(target.goos)) } - log.Println("Building", output) + log.WithField("output", 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/fpm/fpm.go b/pipeline/fpm/fpm.go index b1ac4b91a..c046a8efe 100644 --- a/pipeline/fpm/fpm.go +++ b/pipeline/fpm/fpm.go @@ -34,7 +34,7 @@ func (Pipe) Run(ctx *context.Context) error { return nil } if ctx.Config.Archive.Format == "binary" { - log.Println("Skipped because archive format is binary") + log.Info("skipped because archive format is binary") return nil } _, err := exec.LookPath("fpm") From 9196f2efc352566e96afe890cdb0392d8d6b69f1 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Fri, 23 Jun 2017 19:48:52 -0300 Subject: [PATCH 06/15] merge --- pipeline/build/build.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/build/build.go b/pipeline/build/build.go index bf21e2ff4..0aa70e5a1 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -70,7 +70,7 @@ func build(ctx *context.Context, name string, target buildTarget) error { if ctx.Config.Archive.Format == "binary" { output = filepath.Join(ctx.Config.Dist, name+ext.For(target.goos)) } - log.WithField("output", 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)...) From 8915f8bbf6c8138baa450d1ce93d5df441ecf1d2 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 3 Jul 2017 00:57:39 -0300 Subject: [PATCH 07/15] fixes for multiple builds --- context/context.go | 3 +-- internal/name/name.go | 41 ++++++++++++++++++++++++++++--------- pipeline/archive/archive.go | 19 ++++++++++------- pipeline/build/build.go | 10 ++++++++- 4 files changed, 53 insertions(+), 20 deletions(-) diff --git a/context/context.go b/context/context.go index d36195401..be6bb2a6e 100644 --- a/context/context.go +++ b/context/context.go @@ -43,8 +43,7 @@ var foldersLock sync.Mutex func (ctx *Context) AddArtifact(file string) { artifactsLock.Lock() defer artifactsLock.Unlock() - file = strings.TrimPrefix(file, ctx.Config.Dist) - file = strings.Replace(file, "/", "", -1) + file = strings.TrimPrefix(file, ctx.Config.Dist+"/") ctx.Artifacts = append(ctx.Artifacts, file) log.WithField("artifact", file).Info("new artifact") } diff --git a/internal/name/name.go b/internal/name/name.go index 7bf006ee7..3436eb1aa 100644 --- a/internal/name/name.go +++ b/internal/name/name.go @@ -6,6 +6,7 @@ import ( "bytes" "text/template" + "github.com/goreleaser/goreleaser/config" "github.com/goreleaser/goreleaser/context" ) @@ -19,20 +20,40 @@ type nameData struct { ProjectName string } +func ForBuild(ctx *context.Context, build config.Build, goos, goarch, goarm string) (string, error) { + return apply( + nameData{ + Os: replace(ctx.Config.Archive.Replacements, goos), + Arch: replace(ctx.Config.Archive.Replacements, goarch), + Arm: replace(ctx.Config.Archive.Replacements, goarm), + Version: ctx.Version, + Tag: ctx.Git.CurrentTag, + Binary: build.Binary, + ProjectName: build.Binary, + }, + ctx.Config.Archive.NameTemplate, + ) +} + // For returns the name for the given context, goos, goarch and goarm. func For(ctx *context.Context, goos, goarch, goarm string) (string, error) { - var data = nameData{ - Os: replace(ctx.Config.Archive.Replacements, goos), - Arch: replace(ctx.Config.Archive.Replacements, goarch), - Arm: replace(ctx.Config.Archive.Replacements, goarm), - Version: ctx.Version, - Tag: ctx.Git.CurrentTag, - Binary: ctx.Config.ProjectName, - ProjectName: ctx.Config.ProjectName, - } + return apply( + nameData{ + Os: replace(ctx.Config.Archive.Replacements, goos), + Arch: replace(ctx.Config.Archive.Replacements, goarch), + Arm: replace(ctx.Config.Archive.Replacements, goarm), + Version: ctx.Version, + Tag: ctx.Git.CurrentTag, + Binary: ctx.Config.ProjectName, + ProjectName: ctx.Config.ProjectName, + }, + ctx.Config.Archive.NameTemplate, + ) +} +func apply(data nameData, templateStr string) (string, error) { var out bytes.Buffer - t, err := template.New(data.Binary).Parse(ctx.Config.Archive.NameTemplate) + t, err := template.New(data.ProjectName).Parse(templateStr) if err != nil { return "", err } diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index 12445f650..faab25e85 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -12,7 +12,6 @@ import ( "github.com/goreleaser/archive" "github.com/goreleaser/goreleaser/context" "github.com/goreleaser/goreleaser/internal/archiveformat" - "github.com/goreleaser/goreleaser/internal/ext" "github.com/mattn/go-zglob" "golang.org/x/sync/errgroup" ) @@ -33,9 +32,9 @@ func (Pipe) Run(ctx *context.Context) error { platform := platform g.Go(func() error { if ctx.Config.Archive.Format == "binary" { - return skip(ctx, platform, archive) + return skip(ctx, platform, folder) } - return create(ctx, platform, archive) + return create(ctx, platform, folder) }) } return g.Wait() @@ -77,10 +76,16 @@ func create(ctx *context.Context, platform, name string) error { } func skip(ctx *context.Context, platform, name string) error { - b := name + ext.For(platform) - log.WithField("binary", b).Info("skip archiving") - var binary = filepath.Join(ctx.Config.Dist, b) - ctx.AddArtifact(binary) + var path = filepath.Join(ctx.Config.Dist, name) + binaries, err := ioutil.ReadDir(path) + if err != nil { + return err + } + for _, binary := range binaries { + log.WithField("binary", binary.Name()).Info("skip archiving") + log.Infof("path: %v %v", path, binary.Name()) + ctx.AddArtifact(filepath.Join(path+"/", binary.Name())) + } return nil } diff --git a/pipeline/build/build.go b/pipeline/build/build.go index 55b77e919..a8db2ba89 100644 --- a/pipeline/build/build.go +++ b/pipeline/build/build.go @@ -80,7 +80,15 @@ func doBuild(ctx *context.Context, build config.Build, target buildTarget) error build.Binary+ext.For(target.goos), ) if ctx.Config.Archive.Format == "binary" { - binary = filepath.Join(ctx.Config.Dist, build.Binary+ext.For(target.goos)) + bin, err := name.ForBuild(ctx, build, target.goos, target.goarch, target.goarm) + if err != nil { + return err + } + binary = filepath.Join( + ctx.Config.Dist, + folder, + bin+ext.For(target.goos), + ) } log.WithField("binary", binary).Info("building") cmd := []string{"go", "build"} From 624948faa6e056c193ab93202ed401c0c09fc021 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 3 Jul 2017 01:00:43 -0300 Subject: [PATCH 08/15] test coverage --- internal/name/name_test.go | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/internal/name/name_test.go b/internal/name/name_test.go index 80c5f7eff..a303a5921 100644 --- a/internal/name/name_test.go +++ b/internal/name/name_test.go @@ -35,6 +35,31 @@ func TestNameFor(t *testing.T) { assert.Equal("test_Darwin_x86_64_v1.2.3_1.2.3", name) } +func TestNameForBuild(t *testing.T) { + assert := assert.New(t) + + var ctx = &context.Context{ + Config: config.Project{ + Archive: config.Archive{ + NameTemplate: "{{.Binary}}_{{.Os}}_{{.Arch}}_{{.Tag}}_{{.Version}}", + Replacements: map[string]string{ + "darwin": "Darwin", + "amd64": "x86_64", + }, + }, + ProjectName: "test", + }, + Version: "1.2.3", + Git: context.GitInfo{ + CurrentTag: "v1.2.3", + }, + } + + name, err := ForBuild(ctx, config.Build{Binary: "foo"}, "darwin", "amd64", "") + assert.NoError(err) + assert.Equal("foo_Darwin_x86_64_v1.2.3_1.2.3", name) +} + func TestInvalidNameTemplate(t *testing.T) { var assert = assert.New(t) var ctx = &context.Context{ From 74d3f69289f8cf6c970f12485de2d34371b281a5 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 3 Jul 2017 01:01:27 -0300 Subject: [PATCH 09/15] godocs --- internal/name/name.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/name/name.go b/internal/name/name.go index 3436eb1aa..a58b0b8c9 100644 --- a/internal/name/name.go +++ b/internal/name/name.go @@ -20,6 +20,8 @@ type nameData struct { ProjectName string } +// ForBuild return the name for the given context, goos, goarch, goarm and +// build, using the build.Binary property instead of project_name. func ForBuild(ctx *context.Context, build config.Build, goos, goarch, goarm string) (string, error) { return apply( nameData{ From 881b17ede170456ee74117bf9676376c3907201b Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 3 Jul 2017 01:08:14 -0300 Subject: [PATCH 10/15] fixed tests --- pipeline/archive/archive.go | 2 +- pipeline/archive/archive_test.go | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pipeline/archive/archive.go b/pipeline/archive/archive.go index faab25e85..707b63b26 100644 --- a/pipeline/archive/archive.go +++ b/pipeline/archive/archive.go @@ -81,9 +81,9 @@ func skip(ctx *context.Context, platform, name string) error { if err != nil { return err } + log.WithField("platform", platform).Debugf("found %v binaries", len(binaries)) for _, binary := range binaries { log.WithField("binary", binary.Name()).Info("skip archiving") - log.Infof("path: %v %v", path, binary.Name()) ctx.AddArtifact(filepath.Join(path+"/", binary.Name())) } return nil diff --git a/pipeline/archive/archive_test.go b/pipeline/archive/archive_test.go index 9877e0932..c66431516 100644 --- a/pipeline/archive/archive_test.go +++ b/pipeline/archive/archive_test.go @@ -75,22 +75,23 @@ func TestRunPipeBinary(t *testing.T) { }() var dist = filepath.Join(folder, "dist") assert.NoError(os.Mkdir(dist, 0755)) - assert.NoError(os.Mkdir(filepath.Join(dist, "mybin"), 0755)) - _, err = os.Create(filepath.Join(dist, "mybin", "mybin")) + assert.NoError(os.Mkdir(filepath.Join(dist, "mybin_darwin"), 0755)) + assert.NoError(os.Mkdir(filepath.Join(dist, "mybin_win"), 0755)) + _, err = os.Create(filepath.Join(dist, "mybin_darwin", "mybin")) assert.NoError(err) - _, err = os.Create(filepath.Join(dist, "mybin", "mybin.exe")) + _, err = os.Create(filepath.Join(dist, "mybin_win", "mybin.exe")) assert.NoError(err) _, err = os.Create(filepath.Join(folder, "README.md")) assert.NoError(err) var ctx = &context.Context{ - Archives: map[string]string{ - "darwinamd64": "mybin", - "windowsamd64": "mybin", + Folders: map[string]string{ + "darwinamd64": "mybin_darwin", + "windowsamd64": "mybin_win", }, Config: config.Project{ Dist: dist, - Build: config.Build{ - Binary: "mybin", + Builds: []config.Build{ + {Binary: "mybin"}, }, Archive: config.Archive{ Format: "binary", @@ -98,8 +99,8 @@ func TestRunPipeBinary(t *testing.T) { }, } assert.NoError(Pipe{}.Run(ctx)) - assert.Contains(ctx.Artifacts, "mybin") - assert.Contains(ctx.Artifacts, "mybin.exe") + assert.Contains(ctx.Artifacts, "mybin_darwin/mybin") + assert.Contains(ctx.Artifacts, "mybin_win/mybin.exe") assert.Len(ctx.Artifacts, 2) } From 3a4128b60f02e0bf637a9978ad6646d814389e59 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 3 Jul 2017 01:11:46 -0300 Subject: [PATCH 11/15] fixed build tests --- pipeline/build/build_test.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pipeline/build/build_test.go b/pipeline/build/build_test.go index d24169f50..66f67a88b 100644 --- a/pipeline/build/build_test.go +++ b/pipeline/build/build_test.go @@ -87,14 +87,17 @@ func TestRunPipeFormatBinary(t *testing.T) { assert.NoError(err) var binary = filepath.Join(folder, "binary-testing") var config = config.Project{ - Dist: folder, - Build: config.Build{ - Binary: "testing", - Goos: []string{ - runtime.GOOS, - }, - Goarch: []string{ - runtime.GOARCH, + ProjectName: "testing", + Dist: folder, + Builds: []config.Build{ + { + Binary: "testing", + Goos: []string{ + runtime.GOOS, + }, + Goarch: []string{ + runtime.GOARCH, + }, }, }, Archive: config.Archive{ @@ -103,8 +106,8 @@ func TestRunPipeFormatBinary(t *testing.T) { }, } var ctx = &context.Context{ - Config: config, - Archives: map[string]string{}, + Config: config, + Folders: map[string]string{}, } assert.NoError(Pipe{}.Run(ctx)) assert.True(exists(binary)) From 559f67836185ff8a771763c2584d11a2073c340b Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 3 Jul 2017 01:24:26 -0300 Subject: [PATCH 12/15] coverage increased on brew pipe --- pipeline/brew/brew_test.go | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pipeline/brew/brew_test.go b/pipeline/brew/brew_test.go index 099ca527c..8b3aa4b5e 100644 --- a/pipeline/brew/brew_test.go +++ b/pipeline/brew/brew_test.go @@ -208,9 +208,25 @@ func TestRunPipeBrewNotSetup(t *testing.T) { assert.False(client.CreatedFile) } -func TestRunPipeNoDarwinBuild(t *testing.T) { +func TestRunPipeBinaryRelease(t *testing.T) { assert := assert.New(t) - var ctx = &context.Context{} + var ctx = &context.Context{ + Publish: true, + Config: config.Project{ + Archive: config.Archive{ + Format: "binary", + }, + Brew: config.Homebrew{ + GitHub: config.Repo{ + Owner: "test", + Name: "test", + }, + }, + }, + Folders: map[string]string{ + "darwinamd64": "bin", + }, + } client := &DummyClient{} assert.NoError(doRun(ctx, client)) assert.False(client.CreatedFile) From 2ed2a81854ab995e4c69ca91cc7fdd02cc5ac0ed Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 3 Jul 2017 01:25:53 -0300 Subject: [PATCH 13/15] coverage increased on fpm pipe --- pipeline/fpm/fpm_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pipeline/fpm/fpm_test.go b/pipeline/fpm/fpm_test.go index 2544710a0..5bad8b24a 100644 --- a/pipeline/fpm/fpm_test.go +++ b/pipeline/fpm/fpm_test.go @@ -27,6 +27,9 @@ func TestRunPipeFormatBinary(t *testing.T) { var assert = assert.New(t) var ctx = &context.Context{ Config: config.Project{ + FPM: config.FPM{ + Formats: []string{"deb"}, + }, Archive: config.Archive{ Format: "binary", }, From 02cf45cb7ef218e514a5c292dd50ee80f15fe9d7 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 3 Jul 2017 01:31:57 -0300 Subject: [PATCH 14/15] more build pipe tests --- pipeline/build/build_test.go | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pipeline/build/build_test.go b/pipeline/build/build_test.go index 66f67a88b..7cf6d74f9 100644 --- a/pipeline/build/build_test.go +++ b/pipeline/build/build_test.go @@ -192,26 +192,30 @@ func TestRunPipeWithInvalidOS(t *testing.T) { func TestRunInvalidNametemplate(t *testing.T) { var assert = assert.New(t) - var ctx = &context.Context{ - Config: config.Project{ - Builds: []config.Build{ - { - Binary: "nametest", - Flags: "-v", - Goos: []string{ - runtime.GOOS, - }, - Goarch: []string{ - runtime.GOARCH, + for _, format := range []string{"tar.gz", "zip", "binary"} { + var ctx = &context.Context{ + Config: config.Project{ + ProjectName: "nameeeee", + Builds: []config.Build{ + { + Binary: "namet{{.est}", + Flags: "-v", + Goos: []string{ + runtime.GOOS, + }, + Goarch: []string{ + runtime.GOARCH, + }, }, }, + Archive: config.Archive{ + Format: format, + NameTemplate: "{{.Binary}", + }, }, - Archive: config.Archive{ - NameTemplate: "{{.Binary}_{{.Os}}_{{.Arch}}_{{.Version}}", - }, - }, + } + assert.Error(Pipe{}.Run(ctx)) } - assert.Error(Pipe{}.Run(ctx)) } func TestRunInvalidLdflags(t *testing.T) { From 1cdfd16d98fb84b47c62e79c1b35c818273e3545 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Tue, 4 Jul 2017 21:28:21 -0300 Subject: [PATCH 15/15] fixed release upload --- pipeline/release/release.go | 5 +++-- pipeline/release/release_test.go | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pipeline/release/release.go b/pipeline/release/release.go index 1e4ccfaaa..23a1fe92a 100644 --- a/pipeline/release/release.go +++ b/pipeline/release/release.go @@ -58,6 +58,7 @@ func upload(ctx *context.Context, client client.Client, releaseID int, artifact return err } defer func() { _ = file.Close() }() - log.WithField("file", file.Name()).Info("uploading") - return client.Upload(ctx, releaseID, artifact, file) + _, name := filepath.Split(path) + log.WithField("file", file.Name()).WithField("name", name).Info("uploading to release") + return client.Upload(ctx, releaseID, name, file) } diff --git a/pipeline/release/release_test.go b/pipeline/release/release_test.go index 5810ee63b..067cbf552 100644 --- a/pipeline/release/release_test.go +++ b/pipeline/release/release_test.go @@ -46,6 +46,8 @@ func TestRunPipe(t *testing.T) { assert.NoError(doRun(ctx, client)) assert.True(client.CreatedRelease) assert.True(client.UploadedFile) + assert.Contains("bin.deb", client.UploadedFileNames) + assert.Contains("bin.tar.gz", client.UploadedFileNames) } func TestRunPipeReleaseCreationFailed(t *testing.T) { @@ -141,6 +143,7 @@ type DummyClient struct { FailToUpload bool CreatedRelease bool UploadedFile bool + UploadedFileNames []string } func (client *DummyClient) CreateRelease(ctx *context.Context, body string) (releaseID int, err error) { @@ -160,5 +163,6 @@ func (client *DummyClient) Upload(ctx *context.Context, releaseID int, name stri return errors.New("upload failed") } client.UploadedFile = true + client.UploadedFileNames = append(client.UploadedFileNames, name) return }