1
0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-04-23 12:18:50 +02:00
This commit is contained in:
Carlos Alexandro Becker 2016-12-28 23:50:37 -02:00
parent e0300e5d80
commit 5d087173b4
No known key found for this signature in database
GPG Key ID: E61E2F7DC14AB940
3 changed files with 7 additions and 10 deletions

View File

@ -32,7 +32,7 @@ func create(system, arch string, config config.ProjectConfig) error {
defer gw.Close() defer gw.Close()
tw := tar.NewWriter(gw) tw := tar.NewWriter(gw)
defer tw.Close() defer tw.Close()
for _, f := range config.FileList { for _, f := range config.Files {
if err := addFile(tw, f, f); err != nil { if err := addFile(tw, f, f); err != nil {
return err return err
} }

View File

@ -6,7 +6,6 @@ import (
"os" "os"
yaml "gopkg.in/yaml.v1" yaml "gopkg.in/yaml.v1"
"fmt"
) )
var emptyBrew = HomebrewDeploy{} var emptyBrew = HomebrewDeploy{}
@ -24,8 +23,8 @@ type BuildConfig struct {
type ProjectConfig struct { type ProjectConfig struct {
Repo string Repo string
Main string Main string
BinaryName string BinaryName string `yaml:"binary_name"`
FileList []string Files []string
Brew HomebrewDeploy Brew HomebrewDeploy
Token string Token string
Build BuildConfig Build BuildConfig
@ -37,9 +36,7 @@ func Load(file string) (config ProjectConfig, err error) {
return config, err return config, err
} }
err = yaml.Unmarshal(data, &config) err = yaml.Unmarshal(data, &config)
fmt.Println("a",config.BinaryName)
config = fix(config) config = fix(config)
fmt.Println("b",config.BinaryName)
if config.BinaryName == "" { if config.BinaryName == "" {
return config, errors.New("missing binary_name") return config, errors.New("missing binary_name")
} }
@ -50,8 +47,8 @@ func Load(file string) (config ProjectConfig, err error) {
} }
func fix(config ProjectConfig) ProjectConfig { func fix(config ProjectConfig) ProjectConfig {
if len(config.FileList) == 0 { if len(config.Files) == 0 {
config.FileList = []string{ config.Files = []string{
"README.md", "README.md",
"LICENSE.md", "LICENSE.md",
} }

View File

@ -9,8 +9,8 @@ func TestFixConfig(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
config := fix(ProjectConfig{}) config := fix(ProjectConfig{})
assert.Equal("main.go", config.Main) assert.Equal("main.go", config.Main)
assert.Contains(config.FileList, "README.md") assert.Contains(config.Files, "README.md")
assert.Contains(config.FileList, "LICENSE.md") assert.Contains(config.Files, "LICENSE.md")
assert.Contains(config.Build.Oses, "darwin") assert.Contains(config.Build.Oses, "darwin")
assert.Contains(config.Build.Oses, "linux") assert.Contains(config.Build.Oses, "linux")
assert.Contains(config.Build.Arches, "386") assert.Contains(config.Build.Arches, "386")