diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3f951423c..330c88576 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,11 +12,12 @@ Prerequisites are: * Build: * `make` * [Go 1.8+](http://golang.org/doc/install) + * [fpm](https://fpm.readthedocs.io/en/latest/installing.html) Clone `goreleaser` from source into `$GOPATH`: ```sh -$ pkdir -p $GOPATH/src/github.com/github.com/goreleaser +$ mkdir -p $GOPATH/src/github.com/github.com/goreleaser $ cd $_ $ git clone git@github.com:goreleaser/goreleaser.git $ cd goreleaser diff --git a/Gopkg.lock b/Gopkg.lock index 61e2727f4..a272c5404 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -100,6 +100,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "d3f68b6665e34ba913718b1ea7bbe0dbb185290b5209146133ca8d70615c09ac" + inputs-digest = "5aac2f70507156662f63f0938ce9730bed3895cc5c519ac97307b9c8004088fe" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index b5eba4eb3..e119c080b 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -99,3 +99,8 @@ [[constraint]] branch = "v2" name = "gopkg.in/yaml.v2" + +[[constraint]] + branch = "master" + name = "github.com/apex/log" + diff --git a/goreleaserlib/goreleaser_test.go b/goreleaserlib/goreleaser_test.go index 6b55d8710..3cb7d5b68 100644 --- a/goreleaserlib/goreleaser_test.go +++ b/goreleaserlib/goreleaser_test.go @@ -166,6 +166,7 @@ func setup(t *testing.T) (current string, back func()) { assert.NoError(os.Chdir(folder)) var gitCmds = [][]string{ {"init"}, + {"config", "commit.gpgSign", "false"}, {"add", "-A"}, {"commit", "--allow-empty", "-m", "asdf"}, {"tag", "v0.0.1"}, diff --git a/internal/buildtarget/targets.go b/internal/buildtarget/targets.go index 519d73215..94de6560c 100644 --- a/internal/buildtarget/targets.go +++ b/internal/buildtarget/targets.go @@ -40,10 +40,16 @@ func allBuildTargets(build config.Build) (targets []Target) { func ignored(build config.Build, target Target) bool { for _, ig := range build.Ignore { - var ignored = New(ig.Goos, ig.Goarch, ig.Goarm) - if ignored == target { - return true + if ig.Goos != "" && ig.Goos != target.OS { + continue } + if ig.Goarch != "" && ig.Goarch != target.Arch { + continue + } + if ig.Goarm != "" && ig.Goarm != target.Arm { + continue + } + return true } return false } diff --git a/internal/buildtarget/targets_test.go b/internal/buildtarget/targets_test.go index 1cad7c469..feb7d7916 100644 --- a/internal/buildtarget/targets_test.go +++ b/internal/buildtarget/targets_test.go @@ -15,6 +15,7 @@ func TestAllBuildTargets(t *testing.T) { "linux", "darwin", "freebsd", + "openbsd", }, Goarch: []string{ "386", @@ -34,6 +35,9 @@ func TestAllBuildTargets(t *testing.T) { Goos: "linux", Goarch: "arm", Goarm: "7", + }, { + Goos: "openbsd", + Goarch: "arm", }, }, } @@ -47,6 +51,8 @@ func TestAllBuildTargets(t *testing.T) { New("freebsd", "amd64", ""), New("freebsd", "arm", "6"), New("freebsd", "arm", "7"), + New("openbsd", "386", ""), + New("openbsd", "amd64", ""), }, All(build)) } diff --git a/pipeline/git/git_test.go b/pipeline/git/git_test.go index 015a43903..a2bfd62a5 100644 --- a/pipeline/git/git_test.go +++ b/pipeline/git/git_test.go @@ -277,6 +277,8 @@ func gitInit(t *testing.T) { out, err := git("init") assert.NoError(err) assert.Contains(out, "Initialized empty Git repository") + _, err = git("config", "commit.gpgSign", "false") + assert.NoError(err) } func gitCommit(t *testing.T, msg string) {