This is an automated email from the ASF dual-hosted git repository.
xjlgod pushed a commit to branch 2.5.0
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.5.0 by this push:
new 14802ba458 optimize: optimize druid 1.2.12 ci (#7536)
14802ba458 is described below
commit 14802ba4583bc5c8c2deb2e9a12154e2cec0f6c1
Author: Jingliu <[email protected]>
AuthorDate: Tue Jul 15 12:52:32 2025 +0800
optimize: optimize druid 1.2.12 ci (#7536)
* opt: optimize druid 1.2.12 ci
* opt: optimize druid 1.2.12 ci
* opt: optimize druid 1.2.12 ci
* opt: optimize druid 1.2.12 ci
---
.github/workflows/test-druid.yml | 3 ---
changes/en-us/2.5.md | 1 +
changes/zh-cn/2.5.md | 1 +
.../server/session/db/DataBaseSessionManagerTest.java | 14 +++-----------
4 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml
index 8538ad4536..b2285f344d 100644
--- a/.github/workflows/test-druid.yml
+++ b/.github/workflows/test-druid.yml
@@ -87,9 +87,6 @@ jobs:
# step 4
- name: "Test with Maven and Druid ${{ matrix.druid }}"
run: |
- if [ "${{ matrix.druid }}" = "1.2.12" ]; then
- export skip_druid_tests=false;
- fi
./mvnw -T 4C clean test \
-Ddruid.version=${{ matrix.druid }} \
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
diff --git a/changes/en-us/2.5.md b/changes/en-us/2.5.md
index 088b6423f4..fd65eb00fd 100644
--- a/changes/en-us/2.5.md
+++ b/changes/en-us/2.5.md
@@ -77,6 +77,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#7391](https://github.com/apache/incubator-seata/pull/7530)] optimize:
upgrade tomcat to 9.0.105
- [[#7390](https://github.com/apache/incubator-seata/pull/7530)] optimize:
optimize license header check
- [[#7389](https://github.com/apache/incubator-seata/pull/7530)] optimize: fix
some js resource missing license header
+- [[#7536](https://github.com/apache/incubator-seata/pull/7536)] optimize:
optimize druid 1.2.12 ci
### test:
diff --git a/changes/zh-cn/2.5.md b/changes/zh-cn/2.5.md
index fb0d80f016..16d2b2de15 100644
--- a/changes/zh-cn/2.5.md
+++ b/changes/zh-cn/2.5.md
@@ -75,6 +75,7 @@
- [[#7391](https://github.com/apache/incubator-seata/pull/7530)]
优化tomcat的9.0.105
- [[#7390](https://github.com/apache/incubator-seata/pull/7530)] 优化license
header checker
- [[#7389](https://github.com/apache/incubator-seata/pull/7530)] 修复 js
resource missing license header
+- [[#7536](https://github.com/apache/incubator-seata/pull/7536)] 优化druid
1.2.12 ci流水
### test:
diff --git
a/server/src/test/java/org/apache/seata/server/session/db/DataBaseSessionManagerTest.java
b/server/src/test/java/org/apache/seata/server/session/db/DataBaseSessionManagerTest.java
index 1188a6e6d9..6b42085696 100644
---
a/server/src/test/java/org/apache/seata/server/session/db/DataBaseSessionManagerTest.java
+++
b/server/src/test/java/org/apache/seata/server/session/db/DataBaseSessionManagerTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Import;
@@ -56,9 +56,8 @@ import static
org.apache.seata.common.DefaultValues.DEFAULT_TX_GROUP;
*/
@SpringBootTest
@Import(DynamicPortTestConfig.class)
-@EnabledIf(
- value =
"org.apache.seata.server.session.db.DataBaseSessionManagerTest#isEnableDruidTest",
- disabledReason = "druid test is skipped")
+// Unit test triggered a bug in Druid, see the issue
https://github.com/alibaba/druid/issues/4936
+@DisabledIfSystemProperty(named = "druid.version", matches = "1.2.12")
public class DataBaseSessionManagerTest {
static SessionManager sessionManager = null;
@@ -67,15 +66,8 @@ public class DataBaseSessionManagerTest {
static BasicDataSource dataSource = null;
- public static boolean isEnableDruidTest() {
- // Unit test triggered a bug in Druid, see the issue
https://github.com/alibaba/druid/issues/4936
- String skipTests = System.getProperty("skip_druid_tests", "true");
- return Boolean.parseBoolean(skipTests);
- }
-
@BeforeAll
public static void start(ApplicationContext context) throws Exception {
- // Unit test triggered a bug in Druid, see the issue
https://github.com/alibaba/druid/issues/4936
DataBaseSessionManager tempSessionManager = new
DataBaseSessionManager();
DataBaseTransactionStoreManager transactionStoreManager =
DataBaseTransactionStoreManager.getInstance();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
