Skip to content

Commit da62886

Browse files
authored
Update main.yaml for Github Action (milvus-io#6381)
Signed-off-by: quicksilver <[email protected]>
1 parent 346e9cb commit da62886

File tree

9 files changed

+15
-9
lines changed

9 files changed

+15
-9
lines changed

.devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Milvus Distributed Dev Container Definition",
33
"dockerComposeFile": ["./docker-compose-devcontainer.yml"],
4-
"service": "ubuntu",
4+
"service": "builder",
55
"initializeCommand": "scripts/devcontainer.sh",
66
"workspaceFolder": "/go/src/github.com/milvus-io/milvus",
77
"remoteEnv": { "GOPROXY": "https://goproxy.cn" },

.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
IMAGE_REPO=milvusdb
22
IMAGE_ARCH=amd64
33
OS_NAME=ubuntu18.04
4-
DATE_VERSION=20210624-063026
4+
DATE_VERSION=latest
55
LATEST_DATE_VERSION=latest
66
MINIO_ADDRESS=minio:9000
77
PULSAR_ADDRESS=pulsar://pulsar:6650

.github/workflows/publish-builder.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions/checkout@v2
3131
- name: Get version from system time after release step
3232
id: extracter
33-
run: echo "::set-output name=version::$(date +%Y%m%d-%H%M%S)"
33+
run: echo "::set-output name=version::$(date +%Y%m%d)"
3434
- name: Docker Pull
3535
shell: bash
3636
run: |

Makefile

+5-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tools/bin/revive: tools/check/go.mod
3333
cppcheck:
3434
@(env bash ${PWD}/scripts/core_build.sh -l)
3535

36-
generated-proto-go:export protoc:=${PWD}/cmake_build/thirdparty/protobuf/protobuf-build/protoc
36+
generated-proto-go: export protoc:=${PWD}/cmake_build/thirdparty/protobuf/protobuf-build/protoc
3737
generated-proto-go: build-cpp
3838
@mkdir -p ${GOPATH}/bin
3939
@which protoc-gen-go 1>/dev/null || (echo "Installing protoc-gen-go" && go get github.com/golang/protobuf/[email protected])
@@ -53,7 +53,7 @@ else
5353
@GO111MODULE=on env bash $(PWD)/scripts/gofmt.sh tests/go/
5454
endif
5555

56-
lint:tools/bin/revive
56+
lint: tools/bin/revive
5757
@echo "Running $@ check"
5858
@tools/bin/revive -formatter friendly -config tools/check/revive.toml ./...
5959

@@ -97,19 +97,21 @@ milvus: build-cpp
9797
build-go: milvus
9898

9999
build-cpp:
100+
@echo "Building Milvus cpp library ..."
100101
@(env bash $(PWD)/scripts/core_build.sh -f "$(CUSTOM_THIRDPARTY_PATH)")
101102
@(env bash $(PWD)/scripts/cwrapper_build.sh -t Release -f "$(CUSTOM_THIRDPARTY_PATH)")
102103
@(env bash $(PWD)/scripts/cwrapper_dablooms_build.sh -t Release -f "$(CUSTOM_THIRDPARTY_PATH)")
103104
@(env bash $(PWD)/scripts/cwrapper_rocksdb_build.sh -t Release -f "$(CUSTOM_THIRDPARTY_PATH)")
104105

105106
build-cpp-with-unittest:
107+
@echo "Building Milvus cpp library with unittest ..."
106108
@(env bash $(PWD)/scripts/core_build.sh -u -f "$(CUSTOM_THIRDPARTY_PATH)")
107109
@(env bash $(PWD)/scripts/cwrapper_build.sh -t Release -f "$(CUSTOM_THIRDPARTY_PATH)")
108110

109111
# Runs the tests.
110112
unittest: test-cpp test-go
111113

112-
test-go:build-cpp
114+
test-go: build-cpp
113115
@echo "Running go unittests..."
114116
@echo "disable go unittest for now, enable it later"
115117
@(env bash $(PWD)/scripts/run_go_unittest.sh)

build/builder.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ gid=$(id -g)
3434

3535
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-ccache"
3636
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-go-mod"
37-
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-thirdparty"
37+
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/thirdparty"
3838
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-vscode-extensions"
3939
chmod -R 777 "${DOCKER_VOLUME_DIRECTORY:-.docker}"
4040

build/docker/builder/cpu/centos7/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ RUN source /etc/profile.d/devtoolset-7.sh && \
3939
./b2 -j2 --prefix=/usr/local --without-python toolset=gcc install && \
4040
cd ../ && rm -rf ./boost_1_65_1*
4141

42+
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
43+
4244
# Install Go
4345
ENV GOPATH /go
4446
ENV GOROOT /usr/local/go

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
- .:/go/src/github.com/milvus-io/milvus:delegated
2929
- ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-ccache:/ccache:delegated
3030
- ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-go-mod:/go/pkg/mod:delegated
31-
- ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-thirdparty:/tmp/thirdparty:delegated
31+
- ${DOCKER_VOLUME_DIRECTORY:-.docker}/thirdparty:/tmp/thirdparty:delegated
3232
- ${DOCKER_VOLUME_DIRECTORY:-.docker}/${IMAGE_ARCH}-${OS_NAME}-vscode-extensions:/home/milvus/.vscode-server/extensions:delegated
3333
working_dir: "/go/src/github.com/milvus-io/milvus"
3434
# Command

scripts/devcontainer.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pushd "$ROOT_DIR"
5454

5555
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-ccache"
5656
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-go-mod"
57-
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-thirdparty"
57+
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/thirdparty"
5858
mkdir -p "${DOCKER_VOLUME_DIRECTORY:-.docker}/amd64-${OS_NAME}-vscode-extensions"
5959
chmod -R 777 "${DOCKER_VOLUME_DIRECTORY:-.docker}"
6060

scripts/run_cpp_unittest.sh

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ for UNITTEST_DIR in "${UNITTEST_DIRS[@]}"; do
2727
exit 1
2828
fi
2929

30+
echo "Running all unittest ..."
3031
${UNITTEST_DIR}/all_tests
3132
if [ $? -ne 0 ]; then
3233
echo ${UNITTEST_DIR}/all_tests "run failed"
@@ -46,6 +47,7 @@ done
4647

4748
# run cwrapper unittest
4849
if [ -f ${CWRAPPER_UNITTEST} ];then
50+
echo "Running cwrapper unittest ..."
4951
${CWRAPPER_UNITTEST}
5052
if [ $? -ne 0 ]; then
5153
echo ${CWRAPPER_UNITTEST} " run failed"

0 commit comments

Comments
 (0)