mirror of
https://gitee.com/milvus-io/milvus.git
synced 2026-01-07 19:31:51 +08:00
enhance: Upgrade go version from 1.20 to 1.21 (#34759)
issue https://github.com/milvus-io/milvus/issues/32982 related pr in master: pr: https://github.com/milvus-io/milvus/pull/33047 https://github.com/milvus-io/milvus/pull/33150 https://github.com/milvus-io/milvus/pull/33176 https://github.com/milvus-io/milvus/pull/33351 https://github.com/milvus-io/milvus/pull/33202 https://github.com/milvus-io/milvus/pull/33192 Signed-off-by: shaoting-huang <shaoting.huang@zilliz.com>
This commit is contained in:
parent
08c6ab8cfb
commit
abc7c84699
8
.env
8
.env
@ -1,10 +1,10 @@
|
||||
IMAGE_REPO=milvusdb
|
||||
IMAGE_ARCH=amd64
|
||||
OS_NAME=ubuntu20.04
|
||||
DATE_VERSION=20231205-43ec2c2
|
||||
LATEST_DATE_VERSION=20231205-43ec2c2
|
||||
GPU_DATE_VERSION=20240111-b580aef
|
||||
LATEST_GPU_DATE_VERSION=20240111-b580aef
|
||||
DATE_VERSION=20240520-d27db99
|
||||
LATEST_DATE_VERSION=20240520-d27db99
|
||||
GPU_DATE_VERSION=20240520-c35eaaa
|
||||
LATEST_GPU_DATE_VERSION=20240520-c35eaaa
|
||||
MINIO_ADDRESS=minio:9000
|
||||
PULSAR_ADDRESS=pulsar://pulsar:6650
|
||||
ETCD_ENDPOINTS=etcd:2379
|
||||
|
||||
2
.github/workflows/mac.yaml
vendored
2
.github/workflows/mac.yaml
vendored
@ -55,7 +55,7 @@ jobs:
|
||||
- name: Setup Go environment
|
||||
uses: actions/setup-go@v2.2.0
|
||||
with:
|
||||
go-version: '~1.20.7'
|
||||
go-version: '~1.21.10'
|
||||
- name: Mac Cache Go Mod Volumes
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
run:
|
||||
go: "1.18"
|
||||
go: "1.21"
|
||||
skip-dirs:
|
||||
- build
|
||||
- configs
|
||||
|
||||
@ -61,7 +61,7 @@ Here's a list of verified OS types where Milvus can successfully build and run:
|
||||
Linux systems (Recommend Ubuntu 20.04 or later):
|
||||
|
||||
```bash
|
||||
go: >= 1.18
|
||||
go: >= 1.21
|
||||
cmake: >= 3.18
|
||||
gcc: 7.5
|
||||
```
|
||||
@ -69,7 +69,7 @@ gcc: 7.5
|
||||
MacOS systems with x86_64 (Big Sur 11.5 or later recommended):
|
||||
|
||||
```bash
|
||||
go: >= 1.18
|
||||
go: >= 1.21
|
||||
cmake: >= 3.18
|
||||
llvm: >= 15
|
||||
```
|
||||
@ -77,7 +77,7 @@ llvm: >= 15
|
||||
MacOS systems with Apple Silicon (Monterey 12.0.1 or later recommended):
|
||||
|
||||
```bash
|
||||
go: >= 1.18 (Arch=ARM64)
|
||||
go: >= 1.21 (Arch=ARM64)
|
||||
cmake: >= 3.18
|
||||
llvm: >= 15
|
||||
```
|
||||
@ -132,8 +132,7 @@ Confirm that your `GOPATH` and `GOBIN` environment variables are correctly set a
|
||||
```shell
|
||||
$ go version
|
||||
```
|
||||
|
||||
Note: go >= 1.18 is required to build Milvus.
|
||||
Note: go >= 1.21 is required to build Milvus.
|
||||
|
||||
#### Docker & Docker Compose
|
||||
|
||||
|
||||
13
Makefile
13
Makefile
@ -17,6 +17,7 @@ OBJPREFIX := "github.com/milvus-io/milvus/cmd/milvus"
|
||||
|
||||
INSTALL_PATH := $(PWD)/bin
|
||||
LIBRARY_PATH := $(PWD)/lib
|
||||
PGO_PATH := $(PWD)/configs/pgo
|
||||
OS := $(shell uname -s)
|
||||
mode = Release
|
||||
|
||||
@ -63,14 +64,14 @@ milvus: build-cpp print-build-info
|
||||
@echo "Building Milvus ..."
|
||||
@source $(PWD)/scripts/setenv.sh && \
|
||||
mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && \
|
||||
GO111MODULE=on $(GO) build -ldflags="-r $${RPATH} -X '$(OBJPREFIX).BuildTags=$(BUILD_TAGS)' -X '$(OBJPREFIX).BuildTime=$(BUILD_TIME)' -X '$(OBJPREFIX).GitCommit=$(GIT_COMMIT)' -X '$(OBJPREFIX).GoVersion=$(GO_VERSION)'" \
|
||||
GO111MODULE=on $(GO) build -pgo=$(PGO_PATH)/default.pgo -ldflags="-r $${RPATH} -X '$(OBJPREFIX).BuildTags=$(BUILD_TAGS)' -X '$(OBJPREFIX).BuildTime=$(BUILD_TIME)' -X '$(OBJPREFIX).GitCommit=$(GIT_COMMIT)' -X '$(OBJPREFIX).GoVersion=$(GO_VERSION)'" \
|
||||
-tags dynamic -o $(INSTALL_PATH)/milvus $(PWD)/cmd/main.go 1>/dev/null
|
||||
|
||||
milvus-gpu: build-cpp-gpu print-gpu-build-info
|
||||
@echo "Building Milvus-gpu ..."
|
||||
@source $(PWD)/scripts/setenv.sh && \
|
||||
mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && \
|
||||
GO111MODULE=on $(GO) build -ldflags="-r $${RPATH} -X '$(OBJPREFIX).BuildTags=$(BUILD_TAGS_GPU)' -X '$(OBJPREFIX).BuildTime=$(BUILD_TIME)' -X '$(OBJPREFIX).GitCommit=$(GIT_COMMIT)' -X '$(OBJPREFIX).GoVersion=$(GO_VERSION)'" \
|
||||
GO111MODULE=on $(GO) build -pgo=$(PGO_PATH)/default.pgo -ldflags="-r $${RPATH} -X '$(OBJPREFIX).BuildTags=$(BUILD_TAGS_GPU)' -X '$(OBJPREFIX).BuildTime=$(BUILD_TIME)' -X '$(OBJPREFIX).GitCommit=$(GIT_COMMIT)' -X '$(OBJPREFIX).GoVersion=$(GO_VERSION)'" \
|
||||
-tags dynamic -o $(INSTALL_PATH)/milvus $(PWD)/cmd/main.go 1>/dev/null
|
||||
|
||||
get-build-deps:
|
||||
@ -92,7 +93,7 @@ getdeps:
|
||||
|
||||
tools/bin/revive: tools/check/go.mod
|
||||
cd tools/check; \
|
||||
$(GO) build -o ../bin/revive github.com/mgechev/revive
|
||||
$(GO) build -pgo=$(PGO_PATH)/default.pgo -o ../bin/revive github.com/mgechev/revive
|
||||
|
||||
cppcheck:
|
||||
@(env bash ${PWD}/scripts/core_build.sh -l)
|
||||
@ -149,14 +150,14 @@ binlog:
|
||||
@echo "Building binlog ..."
|
||||
@source $(PWD)/scripts/setenv.sh && \
|
||||
mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && \
|
||||
GO111MODULE=on $(GO) build -ldflags="-r $${RPATH}" -o $(INSTALL_PATH)/binlog $(PWD)/cmd/tools/binlog/main.go 1>/dev/null
|
||||
GO111MODULE=on $(GO) build -pgo=$(PGO_PATH)/default.pgo -ldflags="-r $${RPATH}" -o $(INSTALL_PATH)/binlog $(PWD)/cmd/tools/binlog/main.go 1>/dev/null
|
||||
|
||||
MIGRATION_PATH = $(PWD)/cmd/tools/migration
|
||||
meta-migration:
|
||||
@echo "Building migration tool ..."
|
||||
@source $(PWD)/scripts/setenv.sh && \
|
||||
mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && \
|
||||
GO111MODULE=on $(GO) build -ldflags="-r $${RPATH} -X '$(OBJPREFIX).BuildTags=$(BUILD_TAGS)' -X '$(OBJPREFIX).BuildTime=$(BUILD_TIME)' -X '$(OBJPREFIX).GitCommit=$(GIT_COMMIT)' -X '$(OBJPREFIX).GoVersion=$(GO_VERSION)'" \
|
||||
GO111MODULE=on $(GO) build -pgo=$(PGO_PATH)/default.pgo -ldflags="-r $${RPATH} -X '$(OBJPREFIX).BuildTags=$(BUILD_TAGS)' -X '$(OBJPREFIX).BuildTime=$(BUILD_TIME)' -X '$(OBJPREFIX).GitCommit=$(GIT_COMMIT)' -X '$(OBJPREFIX).GoVersion=$(GO_VERSION)'" \
|
||||
-tags dynamic -o $(INSTALL_PATH)/meta-migration $(MIGRATION_PATH)/main.go 1>/dev/null
|
||||
|
||||
INTERATION_PATH = $(PWD)/tests/integration
|
||||
@ -349,7 +350,7 @@ clean:
|
||||
milvus-tools: print-build-info
|
||||
@echo "Building tools ..."
|
||||
@mkdir -p $(INSTALL_PATH)/tools && go env -w CGO_ENABLED="1" && GO111MODULE=on $(GO) build \
|
||||
-ldflags="-X 'main.BuildTags=$(BUILD_TAGS)' -X 'main.BuildTime=$(BUILD_TIME)' -X 'main.GitCommit=$(GIT_COMMIT)' -X 'main.GoVersion=$(GO_VERSION)'" \
|
||||
-pgo=$(PGO_PATH)/default.pgo -ldflags="-X 'main.BuildTags=$(BUILD_TAGS)' -X 'main.BuildTime=$(BUILD_TIME)' -X 'main.GitCommit=$(GIT_COMMIT)' -X 'main.GoVersion=$(GO_VERSION)'" \
|
||||
-o $(INSTALL_PATH)/tools $(PWD)/cmd/tools/* 1>/dev/null
|
||||
|
||||
rpm-setup:
|
||||
|
||||
@ -72,21 +72,21 @@ Check the requirements first.
|
||||
|
||||
Linux systems (Ubuntu 20.04 or later recommended):
|
||||
```bash
|
||||
go: >= 1.18
|
||||
go: >= 1.21
|
||||
cmake: >= 3.18
|
||||
gcc: 7.5
|
||||
```
|
||||
|
||||
MacOS systems with x86_64 (Big Sur 11.5 or later recommended):
|
||||
```bash
|
||||
go: >= 1.18
|
||||
go: >= 1.21
|
||||
cmake: >= 3.18
|
||||
llvm: >= 15
|
||||
```
|
||||
|
||||
MacOS systems with Apple Silicon (Monterey 12.0.1 or later recommended):
|
||||
```bash
|
||||
go: >= 1.18 (Arch=ARM64)
|
||||
go: >= 1.21 (Arch=ARM64)
|
||||
cmake: >= 3.18
|
||||
llvm: >= 15
|
||||
```
|
||||
@ -118,7 +118,7 @@ See [Milvus 2.0 vs. 1.x](https://github.com/milvus-io/milvus/blob/master/milvus2
|
||||
<table>
|
||||
<tr>
|
||||
<td width="30%">
|
||||
<a href="https://milvus.io/milvus-demos">
|
||||
<a href="https://milvus.io/milvus-demos">
|
||||
<img src="https://assets.zilliz.com/image_search_59a64e4f22.gif" />
|
||||
</a>
|
||||
</td>
|
||||
|
||||
@ -68,7 +68,7 @@ Milvus 基于 [Apache 2.0 License](https://github.com/milvus-io/milvus/blob/mast
|
||||
请先安装相关依赖。
|
||||
|
||||
```
|
||||
go: 1.18
|
||||
go: 1.21
|
||||
cmake: >=3.18
|
||||
gcc: 7.5
|
||||
protobuf: >=3.7
|
||||
|
||||
@ -14,10 +14,19 @@ FROM amazonlinux:2023
|
||||
ARG TARGETARCH
|
||||
|
||||
RUN dnf install -y wget g++ gcc gdb libatomic libstdc++-static ninja-build git make zip unzip tar which \
|
||||
autoconf automake golang python3 python3-pip perl-FindBin texinfo \
|
||||
autoconf automake python3 python3-pip perl-FindBin texinfo \
|
||||
pkg-config libuuid-devel libaio perl-IPC-Cmd && \
|
||||
rm -rf /var/cache/yum/*
|
||||
|
||||
ENV GOPATH /go
|
||||
ENV GOROOT /usr/local/go
|
||||
ENV GO111MODULE on
|
||||
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
|
||||
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.10.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
|
||||
mkdir -p "$GOPATH/src" "$GOPATH/bin" && \
|
||||
go clean --modcache && \
|
||||
chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR)
|
||||
|
||||
RUN pip3 install conan==1.61.0
|
||||
|
||||
RUN echo "target arch $TARGETARCH"
|
||||
@ -25,7 +34,7 @@ RUN wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.4-linux-`uname -m`.tar.g
|
||||
|
||||
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
|
||||
RUN mkdir /opt/vcpkg && \
|
||||
wget -qO- vcpkg.tar.gz https://github.com/milvus-io/vcpkg/archive/master.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \
|
||||
wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/refs/tags/2023.11.20.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \
|
||||
rm -rf vcpkg.tar.gz
|
||||
|
||||
ENV VCPKG_FORCE_SYSTEM_BINARIES 1
|
||||
@ -35,9 +44,9 @@ RUN /opt/vcpkg/bootstrap-vcpkg.sh -disableMetrics && ln -s /opt/vcpkg/vcpkg /usr
|
||||
RUN vcpkg install azure-identity-cpp azure-storage-blobs-cpp gtest --only-downloads
|
||||
|
||||
RUN mkdir /tmp/ccache && cd /tmp/ccache &&\
|
||||
wget https://dl.fedoraproject.org/pub/epel/9/Everything/`uname -m`/Packages/h/hiredis-1.0.2-1.el9.`uname -m`.rpm &&\
|
||||
wget https://dl.fedoraproject.org/pub/epel/9/Everything/`uname -m`/Packages/h/hiredis-1.0.2-2.el9.`uname -m`.rpm &&\
|
||||
wget https://dl.fedoraproject.org/pub/epel/9/Everything/`uname -m`/Packages/c/ccache-4.5.1-2.el9.`uname -m`.rpm &&\
|
||||
rpm -i hiredis-1.0.2-1.el9.`uname -m`.rpm ccache-4.5.1-2.el9.`uname -m`.rpm &&\
|
||||
rpm -i hiredis-1.0.2-2.el9.`uname -m`.rpm ccache-4.5.1-2.el9.`uname -m`.rpm &&\
|
||||
rm -rf /tmp/ccache
|
||||
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ ENV GOPATH /go
|
||||
ENV GOROOT /usr/local/go
|
||||
ENV GO111MODULE on
|
||||
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
|
||||
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.20.7.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
|
||||
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.10.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
|
||||
mkdir -p "$GOPATH/src" "$GOPATH/bin" && \
|
||||
go clean --modcache && \
|
||||
chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR)
|
||||
|
||||
@ -51,7 +51,7 @@ ENV GOPATH /go
|
||||
ENV GOROOT /usr/local/go
|
||||
ENV GO111MODULE on
|
||||
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
|
||||
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.20.7.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
|
||||
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.10.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go && \
|
||||
mkdir -p "$GOPATH/src" "$GOPATH/bin" && \
|
||||
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ${GOROOT}/bin v1.46.2 && \
|
||||
# export GO111MODULE=on && go get github.com/quasilyte/go-ruleguard/cmd/ruleguard@v0.2.1 && \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
FROM golang:1.18.3-alpine3.16
|
||||
FROM golang:1.21.10-alpine3.19
|
||||
RUN apk add --no-cache make bash
|
||||
0
configs/pgo/default.pgo
Normal file
0
configs/pgo/default.pgo
Normal file
2
go.mod
2
go.mod
@ -1,6 +1,6 @@
|
||||
module github.com/milvus-io/milvus
|
||||
|
||||
go 1.18
|
||||
go 1.21
|
||||
|
||||
require (
|
||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
module github.com/milvus-io/milvus/pkg
|
||||
|
||||
go 1.18
|
||||
go 1.21
|
||||
|
||||
require (
|
||||
github.com/apache/pulsar-client-go v0.6.1-0.20210728062540-29414db801a7
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
```
|
||||
OS: Ubuntu 20.04
|
||||
go:1.18
|
||||
go:1.21
|
||||
cmake: >=3.18
|
||||
gcc: 7.5
|
||||
```
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user