From da628863bc1d6be04a2aed01a28c2bfa534fa151 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Fri, 9 Jul 2021 11:59:09 +0800 Subject: [PATCH] Update main.yaml for Github Action (#6381) Signed-off-by: quicksilver --- .devcontainer.json | 2 +- .env | 2 +- .github/workflows/publish-builder.yaml | 2 +- Makefile | 8 +++++--- build/builder.sh | 2 +- build/docker/builder/cpu/centos7/Dockerfile | 2 ++ docker-compose.yml | 2 +- scripts/devcontainer.sh | 2 +- scripts/run_cpp_unittest.sh | 2 ++ 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.devcontainer.json b/.devcontainer.json index 47e2397771..ad687dfe23 100644 --- a/.devcontainer.json +++ b/.devcontainer.json @@ -1,7 +1,7 @@ { "name": "Milvus Distributed Dev Container Definition", "dockerComposeFile": ["./docker-compose-devcontainer.yml"], - "service": "ubuntu", + "service": "builder", "initializeCommand": "scripts/devcontainer.sh", "workspaceFolder": "/go/src/github.com/milvus-io/milvus", "remoteEnv": { "GOPROXY": "https://goproxy.cn" }, diff --git a/.env b/.env index cb6213a1e6..e264b12105 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ IMAGE_REPO=milvusdb IMAGE_ARCH=amd64 OS_NAME=ubuntu18.04 -DATE_VERSION=20210624-063026 +DATE_VERSION=latest LATEST_DATE_VERSION=latest MINIO_ADDRESS=minio:9000 PULSAR_ADDRESS=pulsar://pulsar:6650 diff --git a/.github/workflows/publish-builder.yaml b/.github/workflows/publish-builder.yaml index 762536d531..a0e2c907a5 100644 --- a/.github/workflows/publish-builder.yaml +++ b/.github/workflows/publish-builder.yaml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v2 - name: Get version from system time after release step id: extracter - run: echo "::set-output name=version::$(date +%Y%m%d-%H%M%S)" + run: echo "::set-output name=version::$(date +%Y%m%d)" - name: Docker Pull shell: bash run: | diff --git a/Makefile b/Makefile index e45e16dbe3..7cf9dbce39 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ tools/bin/revive: tools/check/go.mod cppcheck: @(env bash ${PWD}/scripts/core_build.sh -l) -generated-proto-go:export protoc:=${PWD}/cmake_build/thirdparty/protobuf/protobuf-build/protoc +generated-proto-go: export protoc:=${PWD}/cmake_build/thirdparty/protobuf/protobuf-build/protoc generated-proto-go: build-cpp @mkdir -p ${GOPATH}/bin @which protoc-gen-go 1>/dev/null || (echo "Installing protoc-gen-go" && go get github.com/golang/protobuf/protoc-gen-go@v1.3.2) @@ -53,7 +53,7 @@ else @GO111MODULE=on env bash $(PWD)/scripts/gofmt.sh tests/go/ endif -lint:tools/bin/revive +lint: tools/bin/revive @echo "Running $@ check" @tools/bin/revive -formatter friendly -config tools/check/revive.toml ./... @@ -97,19 +97,21 @@ milvus: build-cpp build-go: milvus build-cpp: + @echo "Building Milvus cpp library ..." @(env bash $(PWD)/scripts/core_build.sh -f "$(CUSTOM_THIRDPARTY_PATH)") @(env bash $(PWD)/scripts/cwrapper_build.sh -t Release -f "$(CUSTOM_THIRDPARTY_PATH)") @(env bash $(PWD)/scripts/cwrapper_dablooms_build.sh -t Release -f "$(CUSTOM_THIRDPARTY_PATH)") @(env bash $(PWD)/scripts/cwrapper_rocksdb_build.sh -t Release -f "$(CUSTOM_THIRDPARTY_PATH)") build-cpp-with-unittest: + @echo "Building Milvus cpp library with unittest ..." @(env bash $(PWD)/scripts/core_build.sh -u -f "$(CUSTOM_THIRDPARTY_PATH)") @(env bash $(PWD)/scripts/cwrapper_build.sh -t Release -f "$(CUSTOM_THIRDPARTY_PATH)") # Runs the tests. unittest: test-cpp test-go -test-go:build-cpp +test-go: build-cpp @echo "Running go unittests..." @echo "disable go unittest for now, enable it later" @(env bash $(PWD)/scripts/run_go_unittest.sh) diff --git a/build/builder.sh b/build/builder.sh index 4a0d7b3de7..39d398cb80 100755 --- a/build/builder.sh +++ b/build/builder.sh @@ -34,7 +34,7 @@ gid=$(id -g) mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-ccache" mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-go-mod" -mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-thirdparty" +mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/thirdparty" mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-vscode-extensions" chmod -R 777 "${DOCKER_VOLUME_DIRECTORY:-.docker}" diff --git a/build/docker/builder/cpu/centos7/Dockerfile b/build/docker/builder/cpu/centos7/Dockerfile index 86071c026c..ba89193d3a 100644 --- a/build/docker/builder/cpu/centos7/Dockerfile +++ b/build/docker/builder/cpu/centos7/Dockerfile @@ -39,6 +39,8 @@ RUN source /etc/profile.d/devtoolset-7.sh && \ ./b2 -j2 --prefix=/usr/local --without-python toolset=gcc install && \ cd ../ && rm -rf ./boost_1_65_1* +ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH + # Install Go ENV GOPATH /go ENV GOROOT /usr/local/go diff --git a/docker-compose.yml b/docker-compose.yml index debb760958..1ad11caa92 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: - .:/go/src/github.com/milvus-io/milvus:delegated - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-ccache:/ccache:delegated - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-go-mod:/go/pkg/mod:delegated - - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-thirdparty:/tmp/thirdparty:delegated + - ${DOCKER_VOLUME_DIRECTORY:-.docker}/thirdparty:/tmp/thirdparty:delegated - ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-vscode-extensions:/home/milvus/.vscode-server/extensions:delegated working_dir: "/go/src/github.com/milvus-io/milvus" # Command diff --git a/scripts/devcontainer.sh b/scripts/devcontainer.sh index 3912d9eb87..ab67e7fca1 100755 --- a/scripts/devcontainer.sh +++ b/scripts/devcontainer.sh @@ -54,7 +54,7 @@ pushd "$ROOT_DIR" mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-ccache" mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-go-mod" -mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-thirdparty" +mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/thirdparty" mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-vscode-extensions" chmod -R 777 "${DOCKER_VOLUME_DIRECTORY:-.docker}" diff --git a/scripts/run_cpp_unittest.sh b/scripts/run_cpp_unittest.sh index e1bb3f96a7..b01ea5faad 100755 --- a/scripts/run_cpp_unittest.sh +++ b/scripts/run_cpp_unittest.sh @@ -27,6 +27,7 @@ for UNITTEST_DIR in "${UNITTEST_DIRS[@]}"; do exit 1 fi + echo "Running all unittest ..." ${UNITTEST_DIR}/all_tests if [ $? -ne 0 ]; then echo ${UNITTEST_DIR}/all_tests "run failed" @@ -46,6 +47,7 @@ done # run cwrapper unittest if [ -f ${CWRAPPER_UNITTEST} ];then + echo "Running cwrapper unittest ..." ${CWRAPPER_UNITTEST} if [ $? -ne 0 ]; then echo ${CWRAPPER_UNITTEST} " run failed"