Commit 2c039f4f authored by 余昆's avatar 余昆
Browse files

fix conflicts 


Former-commit-id: 7450a19e5066565a90fb820e3c17bbf6bed60479
parents b66c6439 6f79d411

.clang-format

+2 −0
Original line number Diff line number Diff line
@@ -23,3 +23,5 @@ 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/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.12

    command:

    - cat

    tty: true

    resources:

      limits:

        memory: "28Gi"

        cpu: "10.0"

        nvidia.com/gpu: 1

      requests:

        memory: "14Gi"

        cpu: "5.0"

"""

                        }

                    }

                    stages {

ci/main_jenkinsfile_no_ut

+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.12

    command:

    - cat

    tty: true

    resources:

      limits:

        memory: "28Gi"

        cpu: "10.0"

        nvidia.com/gpu: 1

      requests:

        memory: "14Gi"

        cpu: "5.0"

"""

                        }

                    }

                    stages {

ci/nightly_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.12

    command:

    - cat

    tty: true

    resources:

      limits:

        memory: "28Gi"

        cpu: "10.0"

        nvidia.com/gpu: 1

      requests:

        memory: "14Gi"

        cpu: "5.0"

"""

                        }

                    }

                    stages {