This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 2c5419a7aa Fix CI Upload Configuration (#15030)
2c5419a7aa is described below
commit 2c5419a7aa418e4b9abfa54cc2375f35317a1464
Author: Albumen Kevin <[email protected]>
AuthorDate: Fri Jan 3 10:26:05 2025 +0800
Fix CI Upload Configuration (#15030)
* Fix CI Upload Configuration
* Fix UnsafeByteArrayOutputStreamTest
---
.github/workflows/build-and-test-pr.yml | 16 ++++++++--------
.github/workflows/build-and-test-scheduled-3.1.yml | 4 ++--
.github/workflows/build-and-test-scheduled-3.2.yml | 4 ++--
.github/workflows/build-and-test-scheduled-3.3.yml | 4 ++--
.github/workflows/release-test.yml | 4 ++--
.../dubbo/common/io/UnsafeByteArrayOutputStreamTest.java | 3 ++-
6 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/build-and-test-pr.yml
b/.github/workflows/build-and-test-pr.yml
index fd2560825a..1315b7f6b2 100644
--- a/.github/workflows/build-and-test-pr.yml
+++ b/.github/workflows/build-and-test-pr.yml
@@ -346,9 +346,9 @@ jobs:
path: target/jacoco*.exec
- name: "Upload test result"
if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
- name: samples-test-result
+ name: samples-test-result-${{matrix.job_id}}
path: test/jobs/*-result*
samples-test-result:
needs: [check-format, samples-test-job]
@@ -362,9 +362,9 @@ jobs:
repository: 'apache/dubbo-samples'
ref: master
- name: "Download test result"
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
- name: samples-test-result
+ pattern: samples-test-result-*
path: test/jobs/
- name: "Merge test result"
run: ./test/scripts/merge-test-results.sh
@@ -449,9 +449,9 @@ jobs:
path: target/jacoco*.exec
- name: "Upload test result"
if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
- name: test-result
+ name: test-result-${{matrix.job_id}}
path: test/jobs/*-result*
integration-test-result:
needs: [check-format, integration-test-job]
@@ -465,9 +465,9 @@ jobs:
repository: 'apache/dubbo-integration-cases'
ref: main
- 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"
run: ./test/scripts/merge-test-results.sh
diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml
b/.github/workflows/build-and-test-scheduled-3.1.yml
index 3fbd32dbee..1762f641bc 100644
--- a/.github/workflows/build-and-test-scheduled-3.1.yml
+++ b/.github/workflows/build-and-test-scheduled-3.1.yml
@@ -316,7 +316,7 @@ jobs:
- name: "Download test result"
uses: actions/download-artifact@v4
with:
- name: samples-test-result-${{matrix.jdk}}-*
+ pattern: samples-test-result-${{matrix.jdk}}-*
github-token: ${{ secrets.GITHUB_TOKEN }}
path: test/jobs/
- name: "Merge test result"
@@ -415,7 +415,7 @@ jobs:
- name: "Download test result"
uses: actions/download-artifact@v4
with:
- name: integration-test-result-${{matrix.jdk}}-*
+ pattern: integration-test-result-${{matrix.jdk}}-*
github-token: ${{ secrets.GITHUB_TOKEN }}
path: test/jobs/
- name: "Merge test result"
diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml
b/.github/workflows/build-and-test-scheduled-3.2.yml
index 9197e0aff5..f084e55c8b 100644
--- a/.github/workflows/build-and-test-scheduled-3.2.yml
+++ b/.github/workflows/build-and-test-scheduled-3.2.yml
@@ -316,7 +316,7 @@ jobs:
- name: "Download test result"
uses: actions/download-artifact@v4
with:
- name: samples-test-result-${{matrix.jdk}}-*
+ pattern: samples-test-result-${{matrix.jdk}}-*
github-token: ${{ secrets.GITHUB_TOKEN }}
path: test/jobs/
- name: "Merge test result"
@@ -415,7 +415,7 @@ jobs:
- name: "Download test result"
uses: actions/download-artifact@v4
with:
- name: integration-test-result-${{matrix.jdk}}-*
+ pattern: integration-test-result-${{matrix.jdk}}-*
github-token: ${{ secrets.GITHUB_TOKEN }}
path: test/jobs/
- name: "Merge test result"
diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml
b/.github/workflows/build-and-test-scheduled-3.3.yml
index bdb3209ab4..fed0d6dc15 100644
--- a/.github/workflows/build-and-test-scheduled-3.3.yml
+++ b/.github/workflows/build-and-test-scheduled-3.3.yml
@@ -316,7 +316,7 @@ jobs:
- name: "Download test result"
uses: actions/download-artifact@v4
with:
- name: samples-test-result-${{matrix.jdk}}-*
+ pattern: samples-test-result-${{matrix.jdk}}-*
github-token: ${{ secrets.GITHUB_TOKEN }}
path: test/jobs/
- name: "Merge test result"
@@ -415,7 +415,7 @@ jobs:
- name: "Download test result"
uses: actions/download-artifact@v4
with:
- name: integration-test-result-${{matrix.jdk}}-*
+ pattern: integration-test-result-${{matrix.jdk}}-*
github-token: ${{ secrets.GITHUB_TOKEN }}
path: test/jobs/
- name: "Merge test result"
diff --git a/.github/workflows/release-test.yml
b/.github/workflows/release-test.yml
index f2d7696944..1a1584d466 100644
--- a/.github/workflows/release-test.yml
+++ b/.github/workflows/release-test.yml
@@ -313,7 +313,7 @@ jobs:
- name: "Download test result"
uses: actions/download-artifact@v4
with:
- name: samples-test-result-${{matrix.jdk}}-*
+ pattern: samples-test-result-${{matrix.jdk}}-*
github-token: ${{ secrets.GITHUB_TOKEN }}
path: test/jobs/
- name: "Merge test result"
@@ -412,7 +412,7 @@ jobs:
- name: "Download test result"
uses: actions/download-artifact@v4
with:
- name: integration-test-result-${{matrix.jdk}}-*
+ pattern: integration-test-result-${{matrix.jdk}}-*
github-token: ${{ secrets.GITHUB_TOKEN }}
path: test/jobs/
- name: "Merge test result"
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java
index 6cb0be0f36..107d66cdf6 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java
@@ -19,6 +19,7 @@ package org.apache.dubbo.common.io;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -72,7 +73,7 @@ class UnsafeByteArrayOutputStreamTest {
@Test
void testToStringWithCharset() throws IOException {
UnsafeByteArrayOutputStream outputStream = new
UnsafeByteArrayOutputStream();
- outputStream.write("Hòa Bình".getBytes());
+ outputStream.write("Hòa Bình".getBytes(StandardCharsets.UTF_8));
assertThat(outputStream.toString("UTF-8"), is("Hòa Bình"));
}
