From 7b69461361564591391be9a5bbfc89d1042664c0 Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Wed, 9 Jan 2019 14:59:46 +0800 Subject: [PATCH 1/3] update build command --- .circleci/config.yml | 4 +--- pom.xml | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6a2acd60..cb0469bce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,9 +24,7 @@ jobs: - ~/.m2 - run: name: "Running build" - command: | - ./mvnw cobertura:cobertura - ./mvnw -Pspring -Pdocs clean install -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + command: ./mvnw -Pspring -Pdocs clean install cobertura:cobertura -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - run: name: "Aggregate test results" when: always diff --git a/pom.xml b/pom.xml index 950b817a7..1a9f6648c 100644 --- a/pom.xml +++ b/pom.xml @@ -189,6 +189,27 @@ xml + + + spring-cloud-alibaba-dependencies/**.*.class + spring-cloud-alibaba-docs/**.*.class + spring-cloud-alibaba-examples/**.*.class + spring-cloud-alibaba-test/**.*.class + spring-cloud-starter-alibaba/**.*.class + spring-cloud-starter-alicloud/**.*.class + spring-cloud-alibaba-nacos-config/src/test/**.*.class + spring-cloud-alibaba-nacos-config-server/src/test/**.*.class + spring-cloud-alibaba-nacos-discovery/src/test/**.*.class + spring-cloud-alibaba-sentinel/src/test/**.*.class + spring-cloud-alibaba-sentinel-datasource/src/test/**.*.class + spring-cloud-alicloud-acm/src/test/**.*.class + spring-cloud-alicloud-ans/src/test/**.*.class + spring-cloud-alicloud-context/src/test/**.*.class + spring-cloud-alicloud-oss/src/test/**.*.class + spring-cloud-alicloud-schedulerx/src/test/**.*.class + spring-cloud-stream-binder-rocketmq/src/test/**.*.class + + From 851faf2bdba5be702255e343b7b1717dfecc75bb Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Wed, 9 Jan 2019 18:54:23 +0800 Subject: [PATCH 2/3] update cobertura settings --- pom.xml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 1a9f6648c..742b16b8e 100644 --- a/pom.xml +++ b/pom.xml @@ -191,23 +191,22 @@ - spring-cloud-alibaba-dependencies/**.*.class - spring-cloud-alibaba-docs/**.*.class - spring-cloud-alibaba-examples/**.*.class - spring-cloud-alibaba-test/**.*.class - spring-cloud-starter-alibaba/**.*.class - spring-cloud-starter-alicloud/**.*.class - spring-cloud-alibaba-nacos-config/src/test/**.*.class - spring-cloud-alibaba-nacos-config-server/src/test/**.*.class - spring-cloud-alibaba-nacos-discovery/src/test/**.*.class - spring-cloud-alibaba-sentinel/src/test/**.*.class - spring-cloud-alibaba-sentinel-datasource/src/test/**.*.class - spring-cloud-alicloud-acm/src/test/**.*.class - spring-cloud-alicloud-ans/src/test/**.*.class - spring-cloud-alicloud-context/src/test/**.*.class - spring-cloud-alicloud-oss/src/test/**.*.class - spring-cloud-alicloud-schedulerx/src/test/**.*.class - spring-cloud-stream-binder-rocketmq/src/test/**.*.class + org/springframework/cloud/alibaba/cloud/dependencies/**.*.class + org/springframework/cloud/alibaba/cloud/docs/**.*.class + org/springframework/cloud/alibaba/cloud/examples/**.*.class + org/springframework/cloud/alibaba/cloud/test/**.*.class + org/springframework/cloud/start/alibaba/**.*.class + org/springframework/cloud/start/alicloud/**.*.class + org/springframework/cloud/alibaba/nacos/src/test/**.*.class + org/springframework/cloud/alibaba/nacos/config/server/src/test/**.*.class + org/springframework/cloud/alibaba/sentinel/src/test/**.*.class + org/springframework/cloud/alibaba/sentinel/datasource/src/test/**.*.class + org/springframework/cloud/alicloud/acm/src/test/**.*.class + org/springframework/cloud/alicloud/ans/src/test/**.*.class + org/springframework/cloud/alicloud/context/src/test/**.*.class + org/springframework/cloud/alicloud/oss/src/test/**.*.class + org/springframework/cloud/alicloud/scx/src/test/**.*.class + org/springframework/cloud/stream/binder/rocketmq/src/test/**.*.class From 223b111d7771c267ce449e832ba9cef8c8d8907d Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Wed, 9 Jan 2019 21:43:58 +0800 Subject: [PATCH 3/3] update codecov settings --- .codecov.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index fcea9e5d8..c871f854d 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,16 +1,7 @@ -coverage: - status: - project: - default: - # basic - target: auto - threshold: null - base: auto - # advanced - branches: null - if_no_uploads: error - if_not_found: success - if_ci_failed: error - only_pulls: false - flags: null - paths: null \ No newline at end of file +ignore: + - "spring-cloud-alibaba-dependencies/.*" + - "spring-cloud-alibaba-docs/.*" + - "spring-cloud-alibaba-examples/.*" + - "spring-cloud-alibaba-test/.*" + - "spring-cloud-starter-alibaba/.*" + - "spring-cloud-starter-alicloud/.*" \ No newline at end of file