From db8e641de5910465afe731d191985d14bc0caade Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Fri, 4 Jan 2019 16:43:49 +0800 Subject: [PATCH 01/15] add codecov's token --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8fbf11a2..58c7cf46 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: command: | mkdir -p ~/junit/ find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \; - bash <(curl -s https://codecov.io/bash) + bash <(curl -s https://codecov.io/bash) -t 8dc515f7-a691-4e29-9b68-6199cd3ca46d - store_artifacts: path: ~/junit/ destination: artifacts From c3e9201ffee529c61d79d3a4eb18da3719f50025 Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Fri, 4 Jan 2019 17:03:15 +0800 Subject: [PATCH 02/15] add command install codecov --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 58c7cf46..63931c49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,9 @@ jobs: - run: name: "Running build" command: ./mvnw -Pspring -Pdocs clean install -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - run: + name: "install codecov" + command: "pip install codecov" - run: name: "Aggregate test results" when: always From 33b947df6ef0cd1955d434eeba7b06bad603e11c Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Fri, 4 Jan 2019 17:17:24 +0800 Subject: [PATCH 03/15] add cobertura --- .circleci/config.yml | 7 +++---- pom.xml | 12 ++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 63931c49..02f7a045 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,10 +24,9 @@ jobs: - ~/.m2 - run: name: "Running build" - command: ./mvnw -Pspring -Pdocs clean install -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - run: - name: "install codecov" - command: "pip install codecov" + 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 - run: name: "Aggregate test results" when: always diff --git a/pom.xml b/pom.xml index 776c8b0b..1d721fb3 100644 --- a/pom.xml +++ b/pom.xml @@ -179,6 +179,18 @@ false + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + html + xml + + + + From de3a093be9c1c160c60c92d4c2239a650babdf3e Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Fri, 4 Jan 2019 17:46:55 +0800 Subject: [PATCH 04/15] add install python --- .circleci/config.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 02f7a045..6ab8c2eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,9 +24,13 @@ jobs: - ~/.m2 - run: name: "Running build" + command: ./mvnw -Pspring -Pdocs clean install -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - run: + name: "look and install python" 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 + python -V + sudo bash -c "yes | add-apt-repository ppa:jonathonf/python-3.6 && apt-get update && apt-get install -y python3.6" + python -V - run: name: "Aggregate test results" when: always From 8b8008889f8ec903f28542efce9083176987b949 Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Fri, 4 Jan 2019 17:51:45 +0800 Subject: [PATCH 05/15] add install python --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ab8c2eb..9e949bce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: name: "look and install python" command: | python -V - sudo bash -c "yes | add-apt-repository ppa:jonathonf/python-3.6 && apt-get update && apt-get install -y python3.6" + bash -c "yes | add-apt-repository ppa:jonathonf/python-3.6 && apt-get update && apt-get install -y python3.6" python -V - run: name: "Aggregate test results" From a756948248fdfb1f0028b792937e7c42ef932a5d Mon Sep 17 00:00:00 2001 From: xiaolongzuo <150349407@qq.com> Date: Mon, 7 Jan 2019 15:46:40 +0800 Subject: [PATCH 06/15] Upgrade alicloud-context version. --- spring-cloud-alibaba-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 0f27aa0c..cc49e9ee 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -24,7 +24,7 @@ 1.0.8 1.0.1 4.0.1 - 1.0.3 + 1.0.4 2.16.0 4.3.1 2.1.6 From 97063e5200652e85bed41ebfccea95a40cbac31b Mon Sep 17 00:00:00 2001 From: xiaolongzuo <150349407@qq.com> Date: Mon, 7 Jan 2019 15:46:40 +0800 Subject: [PATCH 07/15] Upgrade alicloud-context version. --- spring-cloud-alibaba-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 0f27aa0c..cc49e9ee 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -24,7 +24,7 @@ 1.0.8 1.0.1 4.0.1 - 1.0.3 + 1.0.4 2.16.0 4.3.1 2.1.6 From e28d24ba4a2770773a220a6a4674b8633491d89f Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Tue, 8 Jan 2019 14:10:44 +0800 Subject: [PATCH 08/15] update cobertura settings --- .circleci/config.yml | 10 +++------- pom.xml | 8 ++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e949bce..a6a2acd6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,20 +24,16 @@ jobs: - ~/.m2 - run: name: "Running build" - command: ./mvnw -Pspring -Pdocs clean install -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - run: - name: "look and install python" command: | - python -V - bash -c "yes | add-apt-repository ppa:jonathonf/python-3.6 && apt-get update && apt-get install -y python3.6" - python -V + ./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 - run: name: "Aggregate test results" when: always command: | mkdir -p ~/junit/ find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \; - bash <(curl -s https://codecov.io/bash) -t 8dc515f7-a691-4e29-9b68-6199cd3ca46d + bash <(curl -s https://codecov.io/bash) - store_artifacts: path: ~/junit/ destination: artifacts diff --git a/pom.xml b/pom.xml index 1d721fb3..950b817a 100644 --- a/pom.xml +++ b/pom.xml @@ -190,6 +190,14 @@ + + + package + + cobertura + + + From 945d9738dc945d44dc56ec773af1631c4696bada Mon Sep 17 00:00:00 2001 From: gaoyunpeng Date: Tue, 8 Jan 2019 14:44:29 +0800 Subject: [PATCH 09/15] add codecov settings --- .codecov.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .codecov.yml diff --git a/.codecov.yml b/.codecov.yml new file mode 100644 index 00000000..fcea9e5d --- /dev/null +++ b/.codecov.yml @@ -0,0 +1,16 @@ +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 From ada124524cb22c065b50a0a80375736f93636e3e Mon Sep 17 00:00:00 2001 From: xiaojing Date: Tue, 8 Jan 2019 19:36:31 +0800 Subject: [PATCH 10/15] update readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6a1eb9a8..702c12b7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Spring Cloud Alibaba +[![Codecov](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba/branch/master/graph/badge.svg)](https://codecov.io/spring-cloud-incubator/spring-cloud-alibaba) + A project maintained by Alibaba. See the [中文文档](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/README-zh.md) for Chinese readme. From 45a9168f0e4fd0def38a0a11c310eec50374f6bf Mon Sep 17 00:00:00 2001 From: xiaojing Date: Tue, 8 Jan 2019 19:36:51 +0800 Subject: [PATCH 11/15] Update README-zh.md --- README-zh.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README-zh.md b/README-zh.md index 204541be..0b43cff4 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,5 +1,7 @@ # Spring Cloud Alibaba +[![Codecov](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba/branch/master/graph/badge.svg)](https://codecov.io/spring-cloud-incubator/spring-cloud-alibaba) + Spring Cloud Alibaba 致力于提供微服务开发的一站式解决方案。此项目包含开发分布式应用微服务的必需组件，方便开发者通过 Spring Cloud 编程模型轻松使用这些组件来开发分布式应用服务。 依托 Spring Cloud Alibaba，您只需要添加一些注解和少量配置，就可以将 Spring Cloud 应用接入阿里微服务解决方案，通过阿里中间件来迅速搭建分布式应用系统。 From d18a5bcfee4e8d1789de79e5590bb754a0653cff Mon Sep 17 00:00:00 2001 From: xiaojing Date: Tue, 8 Jan 2019 19:49:03 +0800 Subject: [PATCH 12/15] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 702c12b7..ac8452ab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # Spring Cloud Alibaba +[![CircleCI](https://circleci.com/gh/spring-cloud-incubator/spring-cloud-alibaba/tree/master.svg?style=svg)](https://circleci.com/gh/spring-cloud-incubator/spring-cloud-alibaba/tree/master) +[![Maven Central](https://img.shields.io/maven-central/v/org.springframework.cloud/spring-cloud-alibaba-dependencies.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:org.springframework.cloud%20AND%20a:spring-cloud-alibaba-dependencies) [![Codecov](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba/branch/master/graph/badge.svg)](https://codecov.io/spring-cloud-incubator/spring-cloud-alibaba) +[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) A project maintained by Alibaba. From 8c82665880b9c9da9a931b73cf2930bfe274a165 Mon Sep 17 00:00:00 2001 From: xiaojing Date: Tue, 8 Jan 2019 19:49:28 +0800 Subject: [PATCH 13/15] Update README-zh.md --- README-zh.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README-zh.md b/README-zh.md index 0b43cff4..f9e58b36 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,6 +1,9 @@ # Spring Cloud Alibaba +[![CircleCI](https://circleci.com/gh/spring-cloud-incubator/spring-cloud-alibaba/tree/master.svg?style=svg)](https://circleci.com/gh/spring-cloud-incubator/spring-cloud-alibaba/tree/master) +[![Maven Central](https://img.shields.io/maven-central/v/org.springframework.cloud/spring-cloud-alibaba-dependencies.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:org.springframework.cloud%20AND%20a:spring-cloud-alibaba-dependencies) [![Codecov](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba/branch/master/graph/badge.svg)](https://codecov.io/spring-cloud-incubator/spring-cloud-alibaba) +[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) Spring Cloud Alibaba 致力于提供微服务开发的一站式解决方案。此项目包含开发分布式应用微服务的必需组件，方便开发者通过 Spring Cloud 编程模型轻松使用这些组件来开发分布式应用服务。 From 3459f12d22e7904151ed48f4daa363cd2ec369c1 Mon Sep 17 00:00:00 2001 From: xiaojing Date: Tue, 8 Jan 2019 19:56:29 +0800 Subject: [PATCH 14/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac8452ab..8b073b61 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CircleCI](https://circleci.com/gh/spring-cloud-incubator/spring-cloud-alibaba/tree/master.svg?style=svg)](https://circleci.com/gh/spring-cloud-incubator/spring-cloud-alibaba/tree/master) [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.cloud/spring-cloud-alibaba-dependencies.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:org.springframework.cloud%20AND%20a:spring-cloud-alibaba-dependencies) -[![Codecov](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba/branch/master/graph/badge.svg)](https://codecov.io/spring-cloud-incubator/spring-cloud-alibaba) +[![Codecov](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba/branch/master/graph/badge.svg)](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) A project maintained by Alibaba. From b47515835248b679bc7c46e38d8fa6b68c077fbd Mon Sep 17 00:00:00 2001 From: xiaojing Date: Tue, 8 Jan 2019 19:56:58 +0800 Subject: [PATCH 15/15] Update README-zh.md --- README-zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-zh.md b/README-zh.md index f9e58b36..bd633778 100644 --- a/README-zh.md +++ b/README-zh.md @@ -2,7 +2,7 @@ [![CircleCI](https://circleci.com/gh/spring-cloud-incubator/spring-cloud-alibaba/tree/master.svg?style=svg)](https://circleci.com/gh/spring-cloud-incubator/spring-cloud-alibaba/tree/master) [![Maven Central](https://img.shields.io/maven-central/v/org.springframework.cloud/spring-cloud-alibaba-dependencies.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:org.springframework.cloud%20AND%20a:spring-cloud-alibaba-dependencies) -[![Codecov](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba/branch/master/graph/badge.svg)](https://codecov.io/spring-cloud-incubator/spring-cloud-alibaba) +[![Codecov](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba/branch/master/graph/badge.svg)](https://codecov.io/gh/spring-cloud-incubator/spring-cloud-alibaba) [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) Spring Cloud Alibaba 致力于提供微服务开发的一站式解决方案。此项目包含开发分布式应用微服务的必需组件，方便开发者通过 Spring Cloud 编程模型轻松使用这些组件来开发分布式应用服务。