Skip to content

Commit

Permalink
enhance: upgrade conan version to v2
Browse files Browse the repository at this point in the history
Signed-off-by: Yellow Shine <[email protected]>
  • Loading branch information
yellow-shine committed Jul 22, 2024
1 parent 21aa23a commit 285793f
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ IMAGE_ARCH=amd64
OS_NAME=ubuntu22.04

# for services.builder.image in docker-compose.yml
DATE_VERSION=20240620-5be9929
LATEST_DATE_VERSION=20240620-5be9929
DATE_VERSION=20240720-5be99hl
LATEST_DATE_VERSION=20240720-5be99hl
# for services.gpubuilder.image in docker-compose.yml
GPU_DATE_VERSION=20240520-c35eaaa
LATEST_GPU_DATE_VERSION=20240520-c35eaaa
GPU_DATE_VERSION=20240720-5be99hl
LATEST_GPU_DATE_VERSION=20240720-5be99hl

# for other services in docker-compose.yml
MINIO_ADDRESS=minio:9000
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
fi
ls -alh /var/tmp/ccache
brew install libomp ninja openblas ccache pkg-config
pip3 install conan==1.61.0
pip3 install conan==2.5.0
if [[ ! -d "/usr/local/opt/llvm" ]]; then
ln -s /usr/local/opt/llvm@14 /usr/local/opt/llvm
fi
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ on:
paths:
- 'build/docker/builder/cpu/**'
- '.github/workflows/publish-builder.yaml'
- 'scripts/install_deps.sh'
- '!**.md'
pull_request:
# file paths to consider in the event. Optional; defaults to all.
paths:
- 'build/docker/builder/cpu/**'
- '.github/workflows/publish-builder.yaml'
- 'scripts/install_deps.sh'
- '!**.md'

concurrency:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-gpu-builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ on:
paths:
- 'build/docker/builder/gpu/**'
- '.github/workflows/publish-gpu-builder.yaml'
- 'scripts/install_deps.sh'
- '!**.md'
pull_request:
# file paths to consider in the event. Optional; defaults to all.
paths:
- 'build/docker/builder/gpu/**'
- '.github/workflows/publish-gpu-builder.yaml'
- 'scripts/install_deps.sh'
- '!**.md'

concurrency:
Expand Down
4 changes: 2 additions & 2 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Milvus uses Conan to manage third-party dependencies for c++.
Install Conan

```shell
pip install conan==1.61.0
pip install conan==2.5.0
```

Note: Conan version 2.x is not currently supported, please use version 1.61.
Expand Down Expand Up @@ -239,7 +239,7 @@ sudo apt install -y clang-format clang-tidy ninja-build gcc g++ curl zip unzip t
# Verify python3 version, need python3 version > 3.8 and version <= 3.11
python3 --version
# pip install conan 1.61.0
pip3 install conan==1.61.0
pip3 install conan==2.5.0
```

#### Install GO 1.80
Expand Down
2 changes: 1 addition & 1 deletion build/docker/builder/cpu/amazonlinux2023/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.10.linux-$TARG
go clean --modcache && \
chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR)

RUN pip3 install conan==1.61.0
RUN pip3 install conan==2.5.0

RUN echo "target arch $TARGETARCH"
RUN wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local
Expand Down
2 changes: 1 addition & 1 deletion build/docker/builder/cpu/rockylinux8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN dnf -y update && \
dnf -y install texinfo openblas-devel ninja-build


RUN pip3 install conan==1.61.0
RUN pip3 install conan==2.5.0
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
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.73 -y
Expand Down
2 changes: 1 addition & 1 deletion build/docker/builder/cpu/ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y gcc-12 g++-12 && cd /usr/bin \
&& unlink g++ && ln -s g++-12 g++ \
&& unlink gcov && ln -s gcov-12 gcov

RUN pip3 install conan==1.61.0
RUN pip3 install conan==2.5.0

RUN echo "target arch $TARGETARCH"
RUN wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local
Expand Down
2 changes: 1 addition & 1 deletion build/docker/builder/gpu/ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
# Install 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
# Install conan
RUN pip3 install conan==1.61.0
RUN pip3 install conan==2.5.0
# Install rust
RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.73 -y
Expand Down
6 changes: 3 additions & 3 deletions scripts/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function install_linux_deps() {
clang-format-12 clang-tidy-12 lcov libtool m4 autoconf automake python3 python3-pip \
pkg-config uuid-dev libaio-dev libopenblas-dev libgoogle-perftools-dev

sudo pip3 install conan==1.61.0
sudo pip3 install conan==2.5.0
elif [[ -x "$(command -v yum)" ]]; then
# for CentOS devtoolset-11
sudo yum install -y epel-release centos-release-scl-rh
Expand All @@ -35,7 +35,7 @@ function install_linux_deps() {
libaio libuuid-devel zip unzip \
ccache lcov libtool m4 autoconf automake

sudo pip3 install conan==1.61.0
sudo pip3 install conan==2.5.0
echo "source scl_source enable devtoolset-11" | sudo tee -a /etc/profile.d/devtoolset-11.sh
echo "source scl_source enable llvm-toolset-11.0" | sudo tee -a /etc/profile.d/llvm-toolset-11.sh
echo "export CLANG_TOOLS_PATH=/opt/rh/llvm-toolset-11.0/root/usr/bin" | sudo tee -a /etc/profile.d/llvm-toolset-11.sh
Expand Down Expand Up @@ -69,7 +69,7 @@ function install_mac_deps() {
export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
brew update && brew upgrade && brew cleanup

pip3 install conan==1.61.0
pip3 install conan==2.5.0

if [[ $(arch) == 'arm64' ]]; then
brew install openssl
Expand Down
2 changes: 1 addition & 1 deletion scripts/install_deps_msys.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pacmanInstall()
mingw-w64-x86_64-diffutils \
mingw-w64-x86_64-go

pip3 install conan==1.61.0
pip3 install conan==2.5.0
}

updateKey()
Expand Down

0 comments on commit 285793f

Please sign in to comment.