mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-07 09:38:39 +08:00
[automated] Update cpu Builder image changes (#34078)
Signed-off-by: Liang Huang <sammy.huang@zilliz.com>
This commit is contained in:
parent
d18c49013b
commit
2cc9df5c50
8
.env
8
.env
@ -2,12 +2,11 @@
|
|||||||
|
|
||||||
IMAGE_REPO=milvusdb
|
IMAGE_REPO=milvusdb
|
||||||
IMAGE_ARCH=amd64
|
IMAGE_ARCH=amd64
|
||||||
OS_NAME=ubuntu20.04
|
OS_NAME=ubuntu22.04
|
||||||
|
|
||||||
# for services.builder.image in docker-compose.yml
|
# for services.builder.image in docker-compose.yml
|
||||||
DATE_VERSION=20240520-d27db99
|
DATE_VERSION=20240620-5be9929
|
||||||
LATEST_DATE_VERSION=20240520-d27db99
|
LATEST_DATE_VERSION=20240620-5be9929
|
||||||
|
|
||||||
# for services.gpubuilder.image in docker-compose.yml
|
# for services.gpubuilder.image in docker-compose.yml
|
||||||
GPU_DATE_VERSION=20240520-c35eaaa
|
GPU_DATE_VERSION=20240520-c35eaaa
|
||||||
LATEST_GPU_DATE_VERSION=20240520-c35eaaa
|
LATEST_GPU_DATE_VERSION=20240520-c35eaaa
|
||||||
@ -17,3 +16,4 @@ MINIO_ADDRESS=minio:9000
|
|||||||
PULSAR_ADDRESS=pulsar://pulsar:6650
|
PULSAR_ADDRESS=pulsar://pulsar:6650
|
||||||
ETCD_ENDPOINTS=etcd:2379
|
ETCD_ENDPOINTS=etcd:2379
|
||||||
AZURITE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;"
|
AZURITE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite:10000/devstoreaccount1;"
|
||||||
|
|
||||||
|
|||||||
10
.github/workflows/code-checker.yaml
vendored
10
.github/workflows/code-checker.yaml
vendored
@ -34,7 +34,7 @@ concurrency:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
ubuntu:
|
ubuntu:
|
||||||
name: Code Checker AMD64 Ubuntu 20.04
|
name: Code Checker AMD64 Ubuntu 22.04
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 180
|
timeout-minutes: 180
|
||||||
strategy:
|
strategy:
|
||||||
@ -54,10 +54,10 @@ jobs:
|
|||||||
- name: Download Caches
|
- name: Download Caches
|
||||||
uses: ./.github/actions/cache
|
uses: ./.github/actions/cache
|
||||||
with:
|
with:
|
||||||
os: 'ubuntu20.04'
|
os: 'ubuntu22.04'
|
||||||
- name: Code Check
|
- name: Code Check
|
||||||
env:
|
env:
|
||||||
OS_NAME: 'ubuntu20.04'
|
OS_NAME: 'ubuntu22.04'
|
||||||
run: |
|
run: |
|
||||||
./build/builder.sh /bin/bash -c "make check-proto-product && make verifiers"
|
./build/builder.sh /bin/bash -c "make check-proto-product && make verifiers"
|
||||||
|
|
||||||
@ -84,7 +84,7 @@ jobs:
|
|||||||
os: 'amazonlinux2023'
|
os: 'amazonlinux2023'
|
||||||
- name: Code Check
|
- name: Code Check
|
||||||
run: |
|
run: |
|
||||||
sed -i 's/ubuntu20.04/amazonlinux2023/g' .env
|
sed -i 's/ubuntu22.04/amazonlinux2023/g' .env
|
||||||
./build/builder.sh /bin/bash -c "make install"
|
./build/builder.sh /bin/bash -c "make install"
|
||||||
|
|
||||||
rockylinux:
|
rockylinux:
|
||||||
@ -110,5 +110,5 @@ jobs:
|
|||||||
os: 'rockylinux8'
|
os: 'rockylinux8'
|
||||||
- name: Code Check
|
- name: Code Check
|
||||||
run: |
|
run: |
|
||||||
sed -i 's/ubuntu20.04/rockylinux8/g' .env
|
sed -i 's/ubuntu22.04/rockylinux8/g' .env
|
||||||
./build/builder.sh /bin/bash -c "make install"
|
./build/builder.sh /bin/bash -c "make install"
|
||||||
|
|||||||
11
.github/workflows/main.yaml
vendored
11
.github/workflows/main.yaml
vendored
@ -43,9 +43,8 @@ concurrency:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Build:
|
Build:
|
||||||
name: Build and test AMD64 Ubuntu 20.04
|
name: Build and test AMD64 Ubuntu 22.04
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 180
|
|
||||||
steps:
|
steps:
|
||||||
- name: 'Setup $HOME'
|
- name: 'Setup $HOME'
|
||||||
# hot fix
|
# hot fix
|
||||||
@ -93,7 +92,7 @@ jobs:
|
|||||||
- name: Download Caches
|
- name: Download Caches
|
||||||
uses: ./.github/actions/cache
|
uses: ./.github/actions/cache
|
||||||
with:
|
with:
|
||||||
os: 'ubuntu20.04'
|
os: 'ubuntu22.04'
|
||||||
kind: 'cpp'
|
kind: 'cpp'
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
@ -130,7 +129,7 @@ jobs:
|
|||||||
- name: Download Caches
|
- name: Download Caches
|
||||||
uses: ./.github/actions/cache
|
uses: ./.github/actions/cache
|
||||||
with:
|
with:
|
||||||
os: 'ubuntu20.04'
|
os: 'ubuntu22.04'
|
||||||
kind: 'cpp'
|
kind: 'cpp'
|
||||||
- name: Start Service
|
- name: Start Service
|
||||||
shell: bash
|
shell: bash
|
||||||
@ -176,7 +175,7 @@ jobs:
|
|||||||
- name: Download Caches
|
- name: Download Caches
|
||||||
uses: ./.github/actions/cache
|
uses: ./.github/actions/cache
|
||||||
with:
|
with:
|
||||||
os: 'ubuntu20.04'
|
os: 'ubuntu22.04'
|
||||||
kind: 'go'
|
kind: 'go'
|
||||||
- name: Start Service
|
- name: Start Service
|
||||||
shell: bash
|
shell: bash
|
||||||
@ -221,7 +220,7 @@ jobs:
|
|||||||
- name: Download Caches
|
- name: Download Caches
|
||||||
uses: ./.github/actions/cache
|
uses: ./.github/actions/cache
|
||||||
with:
|
with:
|
||||||
os: 'ubuntu20.04'
|
os: 'ubuntu22.04'
|
||||||
kind: 'go'
|
kind: 'go'
|
||||||
- name: Start Service
|
- name: Start Service
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|||||||
@ -23,7 +23,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
|
|||||||
# upgrade gcc to 12
|
# upgrade gcc to 12
|
||||||
RUN apt-get update && apt-get install -y gcc-12 g++-12 && cd /usr/bin \
|
RUN apt-get update && apt-get install -y gcc-12 g++-12 && cd /usr/bin \
|
||||||
&& unlink gcc && ln -s gcc-12 gcc \
|
&& unlink gcc && ln -s gcc-12 gcc \
|
||||||
&& unlink g++ && ln -s g++-12 g++
|
&& 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==1.61.0
|
||||||
|
|
||||||
|
|||||||
@ -209,7 +209,7 @@ if [[ -n "${GPU_BUILD:-}" ]]; then
|
|||||||
export TAG="${TAG:-gpu-latest}"
|
export TAG="${TAG:-gpu-latest}"
|
||||||
export MODE="gpu"
|
export MODE="gpu"
|
||||||
else
|
else
|
||||||
export BUILD_COMMAND="${BUILD_COMMAND:-make install}"
|
export BUILD_COMMAND="${BUILD_COMMAND:-make install use_disk_index=ON}"
|
||||||
export BUILD_SCRIPT="builder.sh"
|
export BUILD_SCRIPT="builder.sh"
|
||||||
export BUILD_IMAGE_SCRIPT="build_image.sh"
|
export BUILD_IMAGE_SCRIPT="build_image.sh"
|
||||||
export TAG="${TAG:-latest}"
|
export TAG="${TAG:-latest}"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user