This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-integration-cases.git
The following commit(s) were added to refs/heads/main by this push:
new a40106ef fix log conflict (#55)
a40106ef is described below
commit a40106ef74b5a8b389dae1e47723093cf7e52dc5
Author: stellar <[email protected]>
AuthorDate: Mon Feb 17 09:34:39 2025 +0800
fix log conflict (#55)
* fix log conflict
* update GitHub action artifact@v4
---
.github/workflows/dubbo-3_2.yml | 12 ++++++------
.github/workflows/dubbo-3_3.yml | 12 ++++++------
.github/workflows/nightly-dubbo-3.yml | 12 ++++++------
99-integration/dubbo-samples-serialize-check/pom.xml | 6 ++++++
4 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/dubbo-3_2.yml b/.github/workflows/dubbo-3_2.yml
index 6c91df24..670e2417 100644
--- a/.github/workflows/dubbo-3_2.yml
+++ b/.github/workflows/dubbo-3_2.yml
@@ -116,7 +116,7 @@ jobs:
run: |
bash ./test/scripts/prepare-test.sh
- name: Upload test list
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: test-list
path: test/jobs
@@ -155,7 +155,7 @@ jobs:
path: ~/.m2/repository/org/apache/dubbo
key: ${{ runner.os
}}-dubbo-snapshot-${{needs.build-dubbo.outputs.commit_id}}
- name: Download test list
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: test-list
path: test/jobs/
@@ -171,9 +171,9 @@ jobs:
run: cd test && bash ./run-tests.sh
- name: Upload test result
if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
- name: test-result
+ name: test-result-${{matrix.java}}-${{matrix.job_id}}
path: test/jobs/*-result*
test_result:
@@ -190,9 +190,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Download test result
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
- name: test-result
+ pattern: test-result-*
path: test/jobs/
- name: Merge test result - java ${{matrix.java}}
run: ./test/scripts/merge-test-results.sh
diff --git a/.github/workflows/dubbo-3_3.yml b/.github/workflows/dubbo-3_3.yml
index 177b6181..ac9b7cb9 100644
--- a/.github/workflows/dubbo-3_3.yml
+++ b/.github/workflows/dubbo-3_3.yml
@@ -116,7 +116,7 @@ jobs:
run: |
bash ./test/scripts/prepare-test.sh
- name: Upload test list
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: test-list
path: test/jobs
@@ -155,7 +155,7 @@ jobs:
path: ~/.m2/repository/org/apache/dubbo
key: ${{ runner.os
}}-dubbo-snapshot-${{needs.build-dubbo.outputs.commit_id}}
- name: Download test list
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: test-list
path: test/jobs/
@@ -171,9 +171,9 @@ jobs:
run: cd test && bash ./run-tests.sh
- name: Upload test result
if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
- name: test-result
+ name: test-result-${{matrix.java}}-${{matrix.job_id}}
path: test/jobs/*-result*
test_result:
@@ -190,9 +190,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Download test result
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
- name: test-result
+ pattern: test-result-*
path: test/jobs/
- name: Merge test result - java ${{matrix.java}}
run: ./test/scripts/merge-test-results.sh
diff --git a/.github/workflows/nightly-dubbo-3.yml
b/.github/workflows/nightly-dubbo-3.yml
index aee60782..3020bba8 100644
--- a/.github/workflows/nightly-dubbo-3.yml
+++ b/.github/workflows/nightly-dubbo-3.yml
@@ -116,7 +116,7 @@ jobs:
run: |
bash ./test/scripts/prepare-test.sh
- name: Upload test list
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: test-list
path: test/jobs
@@ -154,7 +154,7 @@ jobs:
path: ~/.m2/repository/org/apache/dubbo
key: ${{ runner.os
}}-dubbo-snapshot-${{needs.build-dubbo.outputs.commit_id}}
- name: Download test list
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
name: test-list
path: test/jobs/
@@ -170,9 +170,9 @@ jobs:
run: cd test && bash ./run-tests.sh
- name: Upload test result
if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
- name: test-result
+ name: test-result-${{matrix.java}}-${{matrix.job_id}}
path: test/jobs/*-result*
test_result:
@@ -189,9 +189,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Download test result
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
- name: test-result
+ pattern: test-result-*
path: test/jobs/
- name: Merge test result - java ${{matrix.java}}
run: ./test/scripts/merge-test-results.sh
diff --git a/99-integration/dubbo-samples-serialize-check/pom.xml
b/99-integration/dubbo-samples-serialize-check/pom.xml
index 23d4ddf1..c1a5470f 100644
--- a/99-integration/dubbo-samples-serialize-check/pom.xml
+++ b/99-integration/dubbo-samples-serialize-check/pom.xml
@@ -81,6 +81,12 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
