Skip to content

Commit aab060a

Browse files
authored
upgrade Go 1.18 in go.mod (milvus-io#18165)
Signed-off-by: Enwei Jiao <[email protected]>
1 parent f0fe8da commit aab060a

File tree

11 files changed

+145
-599
lines changed

11 files changed

+145
-599
lines changed

.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
IMAGE_REPO=milvusdb
22
IMAGE_ARCH=amd64
33
OS_NAME=ubuntu18.04
4-
DATE_VERSION=20220606-679820c
5-
LATEST_DATE_VERSION=20220606-679820c
4+
DATE_VERSION=20220708-c5b5afb
5+
LATEST_DATE_VERSION=20220708-c5b5afb
66
MINIO_ADDRESS=minio:9000
77
PULSAR_ADDRESS=pulsar://pulsar:6650
88
ETCD_ENDPOINTS=etcd:2379

.golangci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
run:
2+
go: '1.18'
23
skip-dirs:
34
- build
45
- configs

DEVELOPMENT.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ Here's a list of verified OS types where Milvus can successfully build and run:
5555
#### Prerequisites
5656
Linux systems (Recommend Ubuntu 18.04 or later):
5757
```bash
58-
go: >= 1.16
58+
go: >= 1.18
5959
cmake: >= 3.18
6060
gcc: 7.5
6161
```
6262

6363
MacOS systems with x86_64 (Big Sur 11.5 or later recommended):
6464
```bash
65-
go: >= 1.16
65+
go: >= 1.18
6666
cmake: >= 3.18
6767
llvm: >= 12
6868
```
@@ -112,7 +112,7 @@ Confirm that your `GOPATH` and `GOBIN` environment variables are correctly set a
112112
```shell
113113
$ go version
114114
```
115-
Note: go >= 1.16 is required to build Milvus.
115+
Note: go >= 1.18 is required to build Milvus.
116116

117117
#### Docker & Docker Compose
118118

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ get-build-deps:
2929
# attention: upgrade golangci-lint should also change Dockerfiles in build/docker/builder/cpu/<os>
3030
getdeps:
3131
@mkdir -p ${GOPATH}/bin
32-
@which golangci-lint 1>/dev/null || (echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.43.0)
32+
@which golangci-lint 1>/dev/null || (echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.46.2)
3333

3434
tools/bin/revive: tools/check/go.mod
3535
cd tools/check; \

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,21 @@ Check the requirements first.
7171

7272
Linux systems (Ubuntu 18.04 or later recommended):
7373
```bash
74-
go: >= 1.16
74+
go: >= 1.18
7575
cmake: >= 3.18
7676
gcc: 7.5
7777
```
7878

7979
MacOS systems with x86_64 (Big Sur 11.5 or later recommended):
8080
```bash
81-
go: >= 1.16
81+
go: >= 1.18
8282
cmake: >= 3.18
8383
llvm: >= 12
8484
```
8585

8686
MacOS systems with Apple Silicon (Monterey 12.0.1 or later recommended):
8787
```bash
88-
go: >= 1.17 (Arch=ARM64)
88+
go: >= 1.18 (Arch=ARM64)
8989
cmake: >= 3.18
9090
llvm: >= 13
9191
```

README_CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Milvus 基于 [Apache 2.0 License](https://github.com/milvus-io/milvus/blob/mast
6868
请先安装相关依赖。
6969

7070
```
71-
go: 1.16
71+
go: 1.18
7272
cmake: >=3.18
7373
gcc: 7.5
7474
protobuf: >=3.7

go.mod

+128-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/milvus-io/milvus
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
github.com/99designs/keyring v1.2.1 // indirect
@@ -14,13 +14,10 @@ require (
1414
github.com/bits-and-blooms/bloom/v3 v3.0.1
1515
github.com/confluentinc/confluent-kafka-go v1.9.1
1616
github.com/containerd/cgroups v1.0.2
17-
github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
18-
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
19-
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
2017
github.com/gin-gonic/gin v1.7.7
2118
github.com/go-basic/ipv4 v1.0.0
22-
github.com/go-sql-driver/mysql v1.6.0 // indirect
2319
github.com/gofrs/flock v0.8.1
20+
github.com/golang/mock v1.5.0
2421
github.com/golang/protobuf v1.5.2
2522
github.com/google/btree v1.0.1
2623
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
@@ -30,11 +27,8 @@ require (
3027
github.com/minio/minio-go/v7 v7.0.10
3128
github.com/opentracing/opentracing-go v1.2.0
3229
github.com/panjf2000/ants/v2 v2.4.8
33-
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
3430
github.com/pkg/errors v0.9.1
3531
github.com/prometheus/client_golang v1.11.0
36-
github.com/prometheus/common v0.26.0 // indirect
37-
github.com/quasilyte/go-ruleguard/dsl v0.3.21 // indirect
3832
github.com/sbinet/npyio v0.6.0
3933
github.com/shirou/gopsutil v3.21.8+incompatible
4034
github.com/spaolacci/murmur3 v1.1.0
@@ -43,9 +37,7 @@ require (
4337
github.com/streamnative/pulsarctl v0.5.0
4438
github.com/stretchr/testify v1.7.4
4539
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c
46-
github.com/tklauser/go-sysconf v0.3.9 // indirect
4740
github.com/uber/jaeger-client-go v2.25.0+incompatible
48-
github.com/uber/jaeger-lib v2.4.0+incompatible // indirect
4941
go.etcd.io/etcd/api/v3 v3.5.0
5042
go.etcd.io/etcd/client/v3 v3.5.0
5143
go.etcd.io/etcd/server/v3 v3.5.0
@@ -61,6 +53,132 @@ require (
6153
stathat.com/c/consistent v1.0.0
6254
)
6355

56+
require github.com/apache/thrift v0.15.0
57+
58+
require (
59+
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
60+
github.com/AthenZ/athenz v1.10.15 // indirect
61+
github.com/DataDog/zstd v1.4.6-0.20210211175136-c6db21d202f4 // indirect
62+
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
63+
github.com/andybalholm/brotli v1.0.4 // indirect
64+
github.com/apache/pulsar-client-go/oauth2 v0.0.0-20211108044248-fe3b7c4e445b // indirect
65+
github.com/ardielle/ardielle-go v1.5.2 // indirect
66+
github.com/beorn7/perks v1.0.1 // indirect
67+
github.com/bits-and-blooms/bitset v1.2.0 // indirect
68+
github.com/campoy/embedmd v1.0.0 // indirect
69+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
70+
github.com/coreos/go-semver v0.3.0 // indirect
71+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
72+
github.com/danieljoos/wincred v1.1.2 // indirect
73+
github.com/davecgh/go-spew v1.1.1 // indirect
74+
github.com/docker/go-units v0.4.0 // indirect
75+
github.com/dustin/go-humanize v1.0.0 // indirect
76+
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
77+
github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
78+
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
79+
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
80+
github.com/fatih/color v1.10.0 // indirect
81+
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
82+
github.com/fsnotify/fsnotify v1.4.9 // indirect
83+
github.com/ghodss/yaml v1.0.0 // indirect
84+
github.com/gin-contrib/sse v0.1.0 // indirect
85+
github.com/go-ole/go-ole v1.2.5 // indirect
86+
github.com/go-playground/locales v0.13.0 // indirect
87+
github.com/go-playground/universal-translator v0.17.0 // indirect
88+
github.com/go-playground/validator/v10 v10.4.1 // indirect
89+
github.com/goccy/go-json v0.7.10 // indirect
90+
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
91+
github.com/godbus/dbus/v5 v5.0.4 // indirect
92+
github.com/gogo/protobuf v1.3.2 // indirect
93+
github.com/golang/snappy v0.0.4 // indirect
94+
github.com/google/uuid v1.3.0 // indirect
95+
github.com/gorilla/websocket v1.4.2 // indirect
96+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
97+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
98+
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
99+
github.com/hashicorp/hcl v1.0.0 // indirect
100+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
101+
github.com/jonboulle/clockwork v0.2.2 // indirect
102+
github.com/json-iterator/go v1.1.11 // indirect
103+
github.com/klauspost/asmfmt v1.3.1 // indirect
104+
github.com/klauspost/cpuid v1.3.1 // indirect
105+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
106+
github.com/kris-nova/logger v0.0.0-20181127235838-fd0d87064b06 // indirect
107+
github.com/kris-nova/lolgopher v0.0.0-20180921204813-313b3abb0d9b // indirect
108+
github.com/leodido/go-urn v1.2.0 // indirect
109+
github.com/linkedin/goavro/v2 v2.11.1 // indirect
110+
github.com/magiconair/properties v1.8.5 // indirect
111+
github.com/mattn/go-colorable v0.1.8 // indirect
112+
github.com/mattn/go-isatty v0.0.12 // indirect
113+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
114+
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
115+
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
116+
github.com/minio/md5-simd v1.1.0 // indirect
117+
github.com/minio/sha256-simd v0.1.1 // indirect
118+
github.com/mitchellh/go-homedir v1.1.0 // indirect
119+
github.com/mitchellh/mapstructure v1.4.1 // indirect
120+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
121+
github.com/modern-go/reflect2 v1.0.1 // indirect
122+
github.com/mtibben/percent v0.2.1 // indirect
123+
github.com/opencontainers/runtime-spec v1.0.2 // indirect
124+
github.com/pelletier/go-toml v1.9.3 // indirect
125+
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
126+
github.com/pmezard/go-difflib v1.0.0 // indirect
127+
github.com/prometheus/client_model v0.2.0 // indirect
128+
github.com/prometheus/common v0.26.0 // indirect
129+
github.com/prometheus/procfs v0.6.0 // indirect
130+
github.com/quasilyte/go-ruleguard/dsl v0.3.21 // indirect
131+
github.com/rs/xid v1.2.1 // indirect
132+
github.com/sirupsen/logrus v1.8.1 // indirect
133+
github.com/soheilhy/cmux v0.1.5 // indirect
134+
github.com/spf13/afero v1.6.0 // indirect
135+
github.com/spf13/cobra v1.1.3 // indirect
136+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
137+
github.com/spf13/pflag v1.0.5 // indirect
138+
github.com/stretchr/objx v0.4.0 // indirect
139+
github.com/subosito/gotenv v1.2.0 // indirect
140+
github.com/tklauser/go-sysconf v0.3.9 // indirect
141+
github.com/tklauser/numcpus v0.3.0 // indirect
142+
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
143+
github.com/uber/jaeger-lib v2.4.0+incompatible // indirect
144+
github.com/ugorji/go/codec v1.1.7 // indirect
145+
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
146+
github.com/zeebo/xxh3 v1.0.1 // indirect
147+
go.etcd.io/bbolt v1.3.6 // indirect
148+
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
149+
go.etcd.io/etcd/client/v2 v2.305.0 // indirect
150+
go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect
151+
go.etcd.io/etcd/raft/v3 v3.5.0 // indirect
152+
go.opentelemetry.io/contrib v0.20.0 // indirect
153+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
154+
go.opentelemetry.io/otel v0.20.0 // indirect
155+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
156+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
157+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
158+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
159+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
160+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
161+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
162+
go.uber.org/multierr v1.6.0 // indirect
163+
golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 // indirect
164+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
165+
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
166+
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
167+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
168+
golang.org/x/text v0.3.7 // indirect
169+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
170+
golang.org/x/tools v0.1.9 // indirect
171+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
172+
gonum.org/v1/gonum v0.9.3 // indirect
173+
google.golang.org/appengine v1.6.7 // indirect
174+
google.golang.org/genproto v0.0.0-20220503193339-ba3ae3f07e29 // indirect
175+
google.golang.org/protobuf v1.28.0 // indirect
176+
gopkg.in/ini.v1 v1.62.0 // indirect
177+
gopkg.in/yaml.v2 v2.4.0 // indirect
178+
gopkg.in/yaml.v3 v3.0.1 // indirect
179+
sigs.k8s.io/yaml v1.2.0 // indirect
180+
)
181+
64182
replace (
65183
github.com/apache/pulsar-client-go => github.com/milvus-io/pulsar-client-go v0.6.8
66184
github.com/bketelsen/crypt => github.com/bketelsen/crypt v0.0.4 // Fix security alert for core-os/etcd

0 commit comments

Comments
 (0)