Skip to content
This repository has been archived by the owner on Aug 30, 2019. It is now read-only.

build: s/glide/dep #378

Merged
merged 1 commit into from
Feb 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 126 additions & 0 deletions Gopkg.lock

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

45 changes: 45 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# 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"


[[constraint]]
name = "github.com/cihub/seelog"
version = "2.6.0"

[[constraint]]
name = "github.com/go-ini/ini"
version = "1.25.2"

[[constraint]]
name = "github.com/gogo/protobuf"
version = "0.5.0"

[[constraint]]
name = "github.com/shirou/gopsutil"
version = "2.17.1"

[[constraint]]
name = "github.com/stretchr/testify"
version = "1.1.4"

[[constraint]]
branch = "v2"
name = "gopkg.in/yaml.v2"
12 changes: 4 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,10 @@ VERSION_MINOR := $(if $(VERSION_MINOR),$(VERSION_MINOR), 0)
VERSION_PATCH := $(if $(VERSION_PATCH),$(VERSION_PATCH), 0)

deps:
# downloads and installs dependencies
go get -d github.com/Masterminds/glide/...
# use a known version
cd $(GOPATH)/src/github.com/Masterminds/glide && git reset --hard v0.12.3 && cd -
# install it
go install github.com/Masterminds/glide/...
# get all dependencies
glide install
go get -d github.com/golang/dep/cmd/dep
cd $(GOPATH)/src/github.com/golang/dep && git reset --hard v0.3.2 && cd -
go install github.com/golang/dep/cmd/dep
dep ensure

install: deps
# prepares all dependencies by running the 'deps' task, generating
Expand Down
78 changes: 0 additions & 78 deletions glide.lock

This file was deleted.

45 changes: 0 additions & 45 deletions glide.yaml

This file was deleted.