From ad62d3cfe4c6e342b89a14bc0fb01a0149e887a9 Mon Sep 17 00:00:00 2001 From: funkye Date: Sat, 23 Dec 2023 16:26:05 +0800 Subject: [PATCH] optimize: restore required_status_checks keep removing the context check (#6201) --- .asf.yaml | 6 ++++++ changes/en-us/2.x.md | 4 ++++ changes/zh-cn/2.x.md | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 14d1d3b6ca9..c10b2d8857c 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -30,14 +30,20 @@ github: dependabot_updates: false protected_branches: master: + required_status_checks: + strict: true required_pull_request_reviews: dismiss_stale_reviews: true required_approving_review_count: 1 develop: + required_status_checks: + strict: true required_pull_request_reviews: dismiss_stale_reviews: true required_approving_review_count: 1 2.x: + required_status_checks: + strict: true required_pull_request_reviews: dismiss_stale_reviews: true required_approving_review_count: 1 diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index d9c7ed1ee7b..b65f849f2c8 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -14,6 +14,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6077](https://github.com/apache/incubator-seata/pull/6077)] fix could not rollback when table with multiple primary - [[#6121](https://github.com/apache/incubator-seata/pull/6121)] fix the branch transaction order error when rolling back - [[#6182](https://github.com/apache/incubator-seata/pull/6182)] fix guava-32.0.0-jre.jar zip file is empty in ci +- [[#6196](https://github.com/apache/incubator-seata/pull/6196)] fix asf config file format error ### optimize: - [[#6031](https://github.com/apache/incubator-seata/pull/6031)] add a check for the existence of the undolog table @@ -38,6 +39,8 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6194](https://github.com/apache/incubator-seata/pull/6194)] fix asf.yaml parse error - [[#6116](https://github.com/apache/incubator-seata/pull/6116)] rewrite NettyPoolKey's hashcode and equals to fix duplicate construction of channel object pools - [[#6195](https://github.com/apache/incubator-seata/pull/6195)] update the url in change log to apache/incubator-seata +- [[#6200](https://github.com/apache/incubator-seata/pull/6200)] cancel required_status_checks +- [[#6201](https://github.com/apache/incubator-seata/pull/6201)] restore required_status_checks kept to remove context validation ### security: - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities @@ -68,5 +71,6 @@ Thanks to these contributors for their code commits. Please report an unintended - [lightClouds917](https://github.com/lightClouds917) - [xingfudeshi](https://github.com/xingfudeshi) - [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke) +- [AlbumenJ](https://github.com/AlbumenJ) Also, we receive many valuable issues, questions and advices from our community. Thanks for you all. diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index bbb822f919c..89d217705c1 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -14,6 +14,7 @@ - [[#6077](https://github.com/apache/incubator-seata/pull/6077)] 修复表存在复合主键索引导致无法回滚问题 - [[#6121](https://github.com/apache/incubator-seata/pull/6121)] 修复回滚分支事务时没有按照时间排序的问题 - [[#6182](https://github.com/apache/incubator-seata/pull/6182)] 修复在ci中guava-32.0.0-jre.jar zip文件为空的问题 +- [[#6196](https://github.com/apache/incubator-seata/pull/6196)] 修复asf配置格式错误的问题 ### optimize: - [[#6031](https://github.com/apache/incubator-seata/pull/6031)] 添加undo_log表的存在性校验 @@ -37,6 +38,8 @@ - [[#6194](https://github.com/apache/incubator-seata/pull/6194)] 修复 asf.yaml 解析错误问题 - [[#6116](https://github.com/apache/incubator-seata/pull/6116)] 重写NettyPoolKey的hashcode和equals，修复了channel对象池重复构建问题 - [[#6195](https://github.com/apache/incubator-seata/pull/6195)] 更新 change log 中的 seata url 为 apache/incubator-seata +- [[#6200](https://github.com/apache/incubator-seata/pull/6200)] 去除required_status_checks检查 +- [[#6201](https://github.com/apache/incubator-seata/pull/6201)] 恢复required_status_checks但去除context校验 ### security: - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本，修复安全漏洞 @@ -66,5 +69,6 @@ - [lightClouds917](https://github.com/lightClouds917) - [xingfudeshi](https://github.com/xingfudeshi) - [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke) +- [AlbumenJ](https://github.com/AlbumenJ) 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。