Commit e0a66315 authored by xiaojun.lin's avatar xiaojun.lin
Browse files

Merge remote-tracking branch 'upstream/branch-0.5.0' into branch-0.5.1 


Former-commit-id: 0be63af1bf658b453e6486cf82c4521c804f2452
parents edde9e80 e532bd39

.clang-format

+7 −0
Original line number Diff line number Diff line
@@ -18,3 +18,10 @@ 
BasedOnStyle:  Google

DerivePointerAlignment: false

ColumnLimit: 120

IndentWidth: 4

AccessModifierOffset: -3

AlwaysBreakAfterReturnType: All

AllowShortBlocksOnASingleLine: false

AllowShortFunctionsOnASingleLine: false

AllowShortIfStatementsOnASingleLine: false

AlignTrailingComments: true

.clang-tidy

+3 −1
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ 
Checks:          'clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-alpha*,google-*,modernize-*,readability-*'

# produce HeaderFilterRegex from cpp/build-support/lint_exclusions.txt with:

# echo -n '^('; sed -e 's/*/\.*/g' cpp/build-support/lint_exclusions.txt | tr '\n' '|'; echo ')$'

HeaderFilterRegex: '^(.*cmake-build-debug.*|.*cmake-build-release.*|.*cmake_build.*|.*src/thirdparty.*|.*src/core/thirdparty.*|.*src/grpc.*|)$'

HeaderFilterRegex: '^(.*cmake-build-debug.*|.*cmake-build-release.*|.*cmake_build.*|.*src/core/thirdparty.*|.*thirdparty.*|.*easylogging++.*|.*SqliteMetaImpl.cpp|.*src/grpc.*|.*src/core.*|.*src/wrapper.*)$'

AnalyzeTemporaryDtors: true

ChainedConditionalReturn: 1

ChainedConditionalAssignment: 1

CheckOptions:

  - key:             google-readability-braces-around-statements.ShortStatementLines

    value:           '1'

ci/jenkinsfile/milvus_build.groovy

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ container('milvus-build-env') { 
                        sh "git config --global user.email \"test@zilliz.com\""

                        sh "git config --global user.name \"test\""

                        withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {

                            sh "./build.sh -l"

                            sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j -u -c"

                        }

                    }

ci/jenkinsfile/milvus_build_no_ut.groovy

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ container('milvus-build-env') { 
                        sh "git config --global user.email \"test@zilliz.com\""

                        sh "git config --global user.name \"test\""

                        withCredentials([usernamePassword(credentialsId: "${params.JFROG_USER}", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {

                            sh "./build.sh -l"

                            sh "export JFROG_ARTFACTORY_URL='${params.JFROG_ARTFACTORY_URL}' && export JFROG_USER_NAME='${USERNAME}' && export JFROG_PASSWORD='${PASSWORD}' && ./build.sh -t ${params.BUILD_TYPE} -j"

                        }

                    }

ci/main_jenkinsfile

+24 −6
Original line number Diff line number Diff line
@@ -33,12 +33,30 @@ pipeline { 
                            cloud 'build-kubernetes'

                            label 'build'

                            defaultContainer 'jnlp'

                            containerTemplate {

                                name 'milvus-build-env'

                                image 'registry.zilliz.com/milvus/milvus-build-env:v0.12'

                                ttyEnabled true

                                command 'cat'

                            }

                            yaml """

apiVersion: v1

kind: Pod

metadata:

  name: milvus-build-env

  labels:

    app: milvus

    componet: build-env

spec:

  containers:

  - name: milvus-build-env

    image: registry.zilliz.com/milvus/milvus-build-env:v0.13

    command:

    - cat

    tty: true

    resources:

      limits:

        memory: "28Gi"

        cpu: "10.0"

        nvidia.com/gpu: 1

      requests:

        memory: "14Gi"

        cpu: "5.0"

"""

                        }

                    }

                    stages {