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.

Sign up for GitHub

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

Jump to bottom

[patch] update deps #660

Merged
merged 7 commits into from
Sep 2, 2020
Merged

[patch] update deps #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d83932
[patch] update dependencies
Sep 1, 2020
f531b31
fix
Sep 1, 2020
70de606
fix
Sep 1, 2020
f4c5015
fix
Sep 1, 2020
a772a45
fix
Sep 1, 2020
cce4f9e
fix
Sep 2, 2020
dc253d5
fix
Sep 2, 2020
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
29 changes: 23 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,8 @@ update: \
clean \
deps \
proto/all \
license \
update/goimports

format \
go/deps

.PHONY: format
## format go codes
Expand All @@ -264,21 +263,39 @@ format/yaml:
"k8s/**/*.yaml"

.PHONY: deps
## install dependencies
## resolve dependencies
deps: \
proto/deps \
deps/install

.PHONY: deps/install
## install dependencies
deps/install: \
goimports/install \
prettier/install
prettier/install \
go/deps

.PHONY: go/deps
## install Go package dependencies
go/deps:
go clean -cache -modcache -testcache -i -r
rm -rf \
/go/pkg \
$(GOCACHE) \
./go.sum \
./go.mod
cp ./hack/go.mod.default ./go.mod
go mod tidy


.PHONY: goimports/install
goimports/install:
go get -u golang.org/x/tools/cmd/goimports
# GO111MODULE=off go get -u golang.org/x/tools/cmd/goimports

.PHONY: prettier/install
prettier/install:
npm install -g prettier
npm install -g npm prettier

.PHONY: version/vald
## print vald version
Expand Down
1 change: 1 addition & 0 deletions dockers/ci/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ COPY Makefile .
COPY Makefile.d Makefile.d
COPY apis/proto apis/proto
COPY versions versions
COPY hack/go.mod.default hack/go.mod.default

RUN apt-get update && apt-get install -y --no-install-recommends \
libhdf5-dev \
Expand Down
39 changes: 25 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
module github.com/vdaas/vald

go 1.14
go 1.15

replace (
cloud.google.com/go => cloud.google.com/go v0.65.0
github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.0+incompatible
github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.33.21
github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.34.15
github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1
github.com/cockroachdb/errors => github.com/cockroachdb/errors v1.7.4-0.20200821164133-7540597692ae
github.com/coreos/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547
github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible
github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.4.0
github.com/go-sql-driver/mysql => github.com/go-sql-driver/mysql v1.5.1-0.20200818111213-46351a889297
github.com/cockroachdb/errors => github.com/cockroachdb/errors v1.7.3
github.com/cockroachdb/sentry-go => github.com/getsentry/sentry-go v0.7.1-0.20200813145726-23c562d005a5
github.com/coreos/etcd => go.etcd.io/etcd v3.3.25+incompatible
github.com/docker/docker => github.com/moby/moby v1.13.1
github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.4.1
github.com/go-sql-driver/mysql => github.com/go-sql-driver/mysql v1.5.0
github.com/gobwas/pool => github.com/gobwas/pool v0.2.1
github.com/gocql/gocql => github.com/gocql/gocql v0.0.0-20200815110948-5378c8f664e9
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2-0.20200807193113-deb6fe8ca7c6
github.com/gogo/googleapis => github.com/gogo/googleapis v1.4.0
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
github.com/google/go-cmp => github.com/google/go-cmp v0.5.2
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0
github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.12.0
github.com/gorilla/mux => github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.3-0.20200822210332-78ab81e2420a
github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.2
github.com/hailocab/go-hostpool => github.com/monzo/go-hostpool v0.0.0-20200724120130-287edbb29340
github.com/klauspost/compress => github.com/klauspost/compress v1.10.11
github.com/tensorflow/tensorflow => github.com/tensorflow/tensorflow v2.1.0+incompatible
github.com/yudai/pp => github.com/k0kubun/pp v3.0.1+incompatible
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
google.golang.org/grpc => google.golang.org/grpc v1.31.1
google.golang.org/protobuf => google.golang.org/protobuf v1.25.0
k8s.io/api => k8s.io/api v0.18.8
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.8
k8s.io/apimachinery => k8s.io/apimachinery v0.18.8
Expand All @@ -28,7 +38,7 @@ replace (
)

require (
cloud.google.com/go v0.64.0
cloud.google.com/go v0.65.0
code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48
contrib.go.opencensus.io/exporter/jaeger v0.2.1
contrib.go.opencensus.io/exporter/prometheus v0.2.0
Expand All @@ -39,6 +49,7 @@ require (
github.com/danielvladco/go-proto-gql/pb v0.6.1
github.com/envoyproxy/protoc-gen-validate v0.1.0
github.com/fsnotify/fsnotify v1.4.9
github.com/getsentry/sentry-go v0.7.0 // indirect
github.com/go-redis/redis/v7 v7.4.0
github.com/go-sql-driver/mysql v1.5.0
github.com/gocql/gocql v0.0.0-20200131111108-92af2e088537
Expand All @@ -49,7 +60,7 @@ require (
github.com/gorilla/mux v1.7.1
github.com/hashicorp/go-version v1.2.1
github.com/json-iterator/go v1.1.10
github.com/klauspost/compress v1.10.11
github.com/klauspost/compress v1.9.0
github.com/kpango/fastime v1.0.16
github.com/kpango/fuid v0.0.0-20200823100533-287aa95e0641
github.com/kpango/gache v1.2.3
Expand All @@ -65,12 +76,12 @@ require (
go.uber.org/goleak v1.1.10
golang.org/x/net v0.0.0-20200822124328-c89045814202
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a
gonum.org/v1/hdf5 v0.0.0-20200504100616-496fefe91614
gonum.org/v1/netlib v0.0.0-20200824093956-f0ca4b3a5ef5 // indirect
gonum.org/v1/plot v0.7.0
google.golang.org/api v0.30.0
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987
google.golang.org/api v0.31.0
google.golang.org/genproto v0.0.0-20200901141002-b3bf27a9dbd1
google.golang.org/grpc v1.31.1
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.18.8
Expand Down
Loading