Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: replace glide with go modules #10

Merged
merged 6 commits into from
May 30, 2019
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
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ sudo: required
language: go

go:
- 1.11.x

install:
- go get -u github.com/Masterminds/glide
- 1.12.x

script:
- glide install
- export GO111MODULE=on
- make
2 changes: 1 addition & 1 deletion core/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ const (
// Version means gaea version
Version = "2019-05-29 15:21:02 +0800 @4d03678"
// Compile means gaea compole info
Compile = "2019-05-29 15:55:24 +0800 by go version go1.11.4 linux/amd64"
Compile = "2019-05-29 23:25:14 +0800 by go version go1.12 linux/amd64"
)
17 changes: 12 additions & 5 deletions docs/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@

## 编译安装

gaea基于go开发,基于glide进行版本管理,并依赖goyacc、gofmt等工具。
gaea基于go开发,基于go modules进行版本管理,并依赖goyacc、gofmt等工具。

* 首先安装依赖包
glide install
* go >= 1.11

* 编译二进制包
make
```bash
# 如果你已配置GOPATH,同时GO11MODULE设置为auto,请克隆Gaea到GOPATH外的目录
git clone git@github.com:XiaoMi/Gaea.git

# 如果拉取依赖速度慢,可以配置GOPROXY
# export GOPROXY=https://athens.azurefd.net

# 编译二进制包
cd Gaea && make
```

## 执行

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

This file was deleted.

28 changes: 0 additions & 28 deletions glide.yaml

This file was deleted.

47 changes: 47 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
module github.com/XiaoMi/Gaea

go 1.12

require (
github.com/coreos/bbolt v1.3.2 // indirect
github.com/coreos/etcd v3.3.13+incompatible
github.com/coreos/go-semver v0.2.0 // indirect
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d // indirect
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf // indirect
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/emirpasic/gods v1.12.0
github.com/gin-contrib/gzip v0.0.1
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 // indirect
github.com/gin-gonic/gin v1.3.0
github.com/go-ini/ini v1.42.0
github.com/gogo/protobuf v1.2.1 // indirect
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/gorilla/websocket v1.4.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.9.0 // indirect
github.com/jonboulle/clockwork v0.1.0 // indirect
github.com/json-iterator/go v1.1.6 // indirect
github.com/mattn/go-isatty v0.0.7 // indirect
github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8
github.com/pingcap/errors v0.11.1
github.com/pingcap/tipb v0.0.0-20190226124958-833c2ffd2fe7
github.com/pkg/errors v0.8.1 // indirect
github.com/prometheus/client_golang v0.9.2
github.com/remyoudompheng/bigfft v0.0.0-20190321074620-2f0d2b0e0001 // indirect
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
github.com/soheilhy/cmux v0.1.4 // indirect
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
go.etcd.io/bbolt v1.3.2 // indirect
go.uber.org/atomic v1.4.0 // indirect
go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.10.0 // indirect
golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480 // indirect
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
google.golang.org/grpc v1.21.0 // indirect
gopkg.in/ini.v1 v1.42.0 // indirect
)
Loading