diff --git a/compress/zip.go b/compress/zip.go index 7d7482545..cf065b126 100644 --- a/compress/zip.go +++ b/compress/zip.go @@ -32,7 +32,7 @@ func create(system, arch string, config config.ProjectConfig) error { defer gw.Close() tw := tar.NewWriter(gw) defer tw.Close() - for _, f := range config.FileList { + for _, f := range config.Files { if err := addFile(tw, f, f); err != nil { return err } diff --git a/config/config.go b/config/config.go index e0e346725..fdfa0b524 100644 --- a/config/config.go +++ b/config/config.go @@ -6,7 +6,6 @@ import ( "os" yaml "gopkg.in/yaml.v1" - "fmt" ) var emptyBrew = HomebrewDeploy{} @@ -24,8 +23,8 @@ type BuildConfig struct { type ProjectConfig struct { Repo string Main string - BinaryName string - FileList []string + BinaryName string `yaml:"binary_name"` + Files []string Brew HomebrewDeploy Token string Build BuildConfig @@ -37,9 +36,7 @@ func Load(file string) (config ProjectConfig, err error) { return config, err } err = yaml.Unmarshal(data, &config) - fmt.Println("a",config.BinaryName) config = fix(config) - fmt.Println("b",config.BinaryName) if config.BinaryName == "" { return config, errors.New("missing binary_name") } @@ -50,8 +47,8 @@ func Load(file string) (config ProjectConfig, err error) { } func fix(config ProjectConfig) ProjectConfig { - if len(config.FileList) == 0 { - config.FileList = []string{ + if len(config.Files) == 0 { + config.Files = []string{ "README.md", "LICENSE.md", } diff --git a/config/config_test.go b/config/config_test.go index 6b264f262..7b60e6e33 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -9,8 +9,8 @@ func TestFixConfig(t *testing.T) { assert := assert.New(t) config := fix(ProjectConfig{}) assert.Equal("main.go", config.Main) - assert.Contains(config.FileList, "README.md") - assert.Contains(config.FileList, "LICENSE.md") + assert.Contains(config.Files, "README.md") + assert.Contains(config.Files, "LICENSE.md") assert.Contains(config.Build.Oses, "darwin") assert.Contains(config.Build.Oses, "linux") assert.Contains(config.Build.Arches, "386")