Skip to content

Commit

Permalink
Migrate to dep (s12v#16)
Browse files Browse the repository at this point in the history
Ran `dep init` and then `dep ensure`. I had to remove elastic/beats from `Gopkg.toml` and re-run `dep ensure` to fix the strage error `target/filebeat-master-go1.10- flag redefined: strict.perms` in travis builds.

Uses the latest stable release of `dep`:
```
$ dep version
dep:
 version     : v0.4.1
 build date  : 2018-01-27
 git hash    : 37d9ea0
 go version  : go1.9.3
 go compiler : gc
 platform    : darwin/amd64
```

Resolves s12v#9
  • Loading branch information
mumoshu authored May 23, 2018
1 parent 1dcef5e commit 05f2dcd
Show file tree
Hide file tree
Showing 6 changed files with 195 additions and 54 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go:

install:
- go get github.com/elastic/beats || true
- curl https://glide.sh/get | sh
- glide install
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
- dep ensure

script:
- |
Expand Down
156 changes: 156 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true

ignored = ["github.com/elastic/beats"]

[[constraint]]
name = "github.com/aws/aws-sdk-go"
version = "1.12.53"

[prune]
go-tests = true
unused-packages = true
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ Build requires Go 1.10+ and Linux. You need to define Filebeat version (`v6.1.3`

```
go get github.com/elastic/beats
# curl https://glide.sh/get | sh
glide install
# curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
dep ensure
make BEATS_VERSION=v6.1.3
```

Expand Down
40 changes: 0 additions & 40 deletions glide.lock

This file was deleted.

10 changes: 0 additions & 10 deletions glide.yaml

This file was deleted.

0 comments on commit 05f2dcd

Please sign in to comment.