From ae0094589395ec771e98433ff8245c10c5754884 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Thu, 3 Nov 2022 11:49:14 +0800
Subject: [PATCH] docs:update PR template. (#691)
---
.github/PULL_REQUEST_TEMPLATE.md | 12 ++++---
.github/workflows/codecov.yml | 34 +++++++++++++++++++
CHANGELOG.md | 1 +
.../RateLimitRuleLabelResolverTest.java | 2 +-
.../PolarisRateLimitRuleEndpointTests.java | 2 +-
spring-cloud-tencent-dependencies/pom.xml | 2 +-
6 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 .github/workflows/codecov.yml
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b89266620..7d9d0022d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,16 +13,20 @@ Other... Please describe:
## Adding the issue link (#xxx) if possible.
+
+
## Note
## Checklist
-- [ ] Add copyright holder at the beginning of .class file if it is new.
-- [ ] Add information of this PR to CHANGELOG.md in root of project.
+- [ ] Coverage from `Codecov Report` should not decrease (which means adding junit tests for adding or updating code).
- [ ] All junit tests passing.
-- [ ] Coverage from `Codecov Report` should not decrease.
+- [ ] Add copyright holder at the beginning of .java file if it is new.
+- [ ] Add information of this PR to CHANGELOG.md in root of project.
## Checklist (Optional)
- [ ] Will Pull Request to branch of 2020.0 and hoxton.
-- [ ] Add documentation in javadoc in code or comment below the PR if necessary.
+- [ ] Add documentation in javadoc or comment below the PR if necessary.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
new file mode 100644
index 000000000..721286f3d
--- /dev/null
+++ b/.github/workflows/codecov.yml
@@ -0,0 +1,34 @@
+name: Codecov
+
+on:
+ push:
+ branches:
+ - hoxton
+ - 2021.0
+ - 2020.0
+ - greenwich
+ pull_request:
+ branches:
+ - hoxton
+ - 2021.0
+ - 2020.0
+ - greenwich
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout codes
+ uses: actions/checkout@v3
+ - name: Set up JDK 8
+ uses: actions/setup-java@v3
+ with:
+ distribution: 'temurin'
+ java-version: 8
+ - name: Test with Maven
+ run: mvn -B test --file pom.xml
+ - name: Upload coverage to Codecov
+ uses: codecov/codecov-action@v3
+ with:
+ file: ${{ github.workspace }}/target/site/jacoco/jacoco.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1d7e74be..6b553130d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,3 +4,4 @@
- [Optimize:optimize SpringValueProcessor.](https://github.com/Tencent/spring-cloud-tencent/pull/668)
- [Optimize: Register the service with the ProviderAPI#registerInstance method.](https://github.com/Tencent/spring-cloud-tencent/pull/685)
- [Optimize:optimize spring annotation.](https://github.com/Tencent/spring-cloud-tencent/pull/688)
+- [docs:update PR template.](https://github.com/Tencent/spring-cloud-tencent/pull/691)
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolverTest.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolverTest.java
index 96b73cea9..c9abe032d 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolverTest.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/RateLimitRuleLabelResolverTest.java
@@ -61,7 +61,7 @@ public class RateLimitRuleLabelResolverTest {
}
else {
ModelProto.MatchString matchString = ModelProto.MatchString.newBuilder()
- .setType(ModelProto.MatchString.MatchStringType.EXACT)
+ .setType(ModelProto.Operation.EXACT)
.setValue(StringValue.of("value"))
.setValueType(ModelProto.MatchString.ValueType.TEXT).build();
RateLimitProto.Rule rule = RateLimitProto.Rule.newBuilder()
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java
index 33edd0b36..d157c1e0a 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/endpoint/PolarisRateLimitRuleEndpointTests.java
@@ -83,7 +83,7 @@ public class PolarisRateLimitRuleEndpointTests {
}
else {
ModelProto.MatchString matchString = ModelProto.MatchString.newBuilder()
- .setType(ModelProto.MatchString.MatchStringType.EXACT)
+ .setType(ModelProto.Operation.EXACT)
.setValue(StringValue.of("value"))
.setValueType(ModelProto.MatchString.ValueType.TEXT).build();
RateLimitProto.Rule rule = RateLimitProto.Rule.newBuilder()
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index dd1d3bc23..e38aa3ec5 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -73,7 +73,7 @@
1.9.0-2020.0.5-SNAPSHOT
- 1.9.1
+ 1.10.0-SNAPSHOT
1.2.11
4.5.1
1.12.10