summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhoujinchuan <[email protected]>2024-07-10 18:52:37 +0800
committerhoujinchuan <[email protected]>2024-07-10 18:52:37 +0800
commit40fa29281564e45fc60ed56bfb7281b59b8780ce (patch)
treec1a977116dbd70b5b97c35c49805759ed30e95c5
parente8ccc23266e4bad88fcab28d916a5915aa992dfe (diff)
修复test和build错误
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--src/test/java/com/zdjizhi/FileChunkCombinerTests.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05ed193..9b8f2aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,7 @@ test:
- mvn $MAVEN_CLI_OPTS clean test
only:
- merge_requests
+ - develop
- tags
# 构建。一般用于构建 develop 分支上的 snapshot 版本。
@@ -22,7 +23,7 @@ build:
stage: build
script:
- echo "$MAVEN_SETTINGS_XML" > /usr/share/maven/conf/settings.xml
- - mvn clean site deploy -DskipTests
+ - mvn $MAVEN_CLI_OPTS clean package -DskipTests
only:
- develop
diff --git a/src/test/java/com/zdjizhi/FileChunkCombinerTests.java b/src/test/java/com/zdjizhi/FileChunkCombinerTests.java
index 3434bcb..ed9f37e 100644
--- a/src/test/java/com/zdjizhi/FileChunkCombinerTests.java
+++ b/src/test/java/com/zdjizhi/FileChunkCombinerTests.java
@@ -513,7 +513,7 @@ public class FileChunkCombinerTests {
@Test
public void testPipelineDuplicateChunk() throws Exception {
CollectSink.values.clear();
- long windowTime = 5;
+ long windowTime = 10;
//添加重复chunk
messagePackList.add(messagePackList.get(5));
messagePackList.add(messagePackList.get(15));