Skip to content

Commit 8aa9d10

Browse files
authored
Merge branch 'dev' into Improvement-Metrics
2 parents e30a3d3 + 46f0f3c commit 8aa9d10

13 files changed

Lines changed: 874 additions & 38 deletions

File tree

.github/workflows/api-test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ jobs:
119119
class: org.apache.dolphinscheduler.api.test.cases.GrpcTaskAPITest
120120
- name: OidcLoginAPITest
121121
class: org.apache.dolphinscheduler.api.test.cases.OidcLoginAPITest
122+
- name: DependentTaskAPITest
123+
class: org.apache.dolphinscheduler.api.test.cases.tasks.DependentTaskAPITest
122124
env:
123125
RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
124126
steps:
@@ -138,7 +140,7 @@ jobs:
138140
path: ~/.m2/repository
139141
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-api-test
140142
restore-keys: ${{ runner.os }}-maven-
141-
- uses: actions/download-artifact@v4
143+
- uses: actions/download-artifact@v8
142144
name: Download Docker Images
143145
with:
144146
name: standalone-image-api-test

.github/workflows/backend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
submodules: true
122122
- name: Collect Workflow Metrics
123123
uses: ./.github/actions/actions-workflow-metrics
124-
- uses: actions/download-artifact@v4
124+
- uses: actions/download-artifact@v8
125125
name: Download Binary Package
126126
with:
127127
# Only run cluster test on jdk8
@@ -151,7 +151,7 @@ jobs:
151151
- name: Collect Workflow Metrics
152152
uses: ./.github/actions/actions-workflow-metrics
153153
- name: Download Binary Package
154-
uses: actions/download-artifact@v4
154+
uses: actions/download-artifact@v8
155155
with:
156156
name: binary-package-8
157157
path: ds_schema_check_test/dev

.github/workflows/codeql.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v6
4242
with:
4343
submodules: true
4444

4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v2
46+
uses: github/codeql-action/init@v4
4747
with:
4848
languages: java
4949
queries: +security-and-quality
@@ -55,4 +55,4 @@ jobs:
5555
-Prelease
5656
5757
- name: Perform CodeQL Analysis
58-
uses: github/codeql-action/analyze@v2
58+
uses: github/codeql-action/analyze@v4

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@v6
4444
- name: Set up Python 3.9
45-
uses: actions/setup-python@v2
45+
uses: actions/setup-python@v6
4646
with:
4747
python-version: 3.9
4848
- name: Run Dev Relative Reference

.github/workflows/frontend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
name: Sanity Check
6969
uses: ./.github/actions/sanity-check
7070
- name: Set up Node.js
71-
uses: actions/setup-node@v2
71+
uses: actions/setup-node@v6
7272
with:
7373
node-version: 16
7474
- name: Code Format Check

dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSender.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -156,24 +156,6 @@ private static String get(String url) throws IOException {
156156
}
157157
}
158158

159-
private static String mkString(Iterable<String> list) {
160-
if (null == list || StringUtils.isEmpty("|")) {
161-
return null;
162-
}
163-
164-
StringBuilder sb = new StringBuilder();
165-
boolean first = true;
166-
for (String item : list) {
167-
if (first) {
168-
first = false;
169-
} else {
170-
sb.append("|");
171-
}
172-
sb.append(item);
173-
}
174-
return sb.toString();
175-
}
176-
177159
private static AlertResult checkWeChatSendMsgResult(String result) {
178160
AlertResult alertResult = new AlertResult();
179161
alertResult.setSuccess(false);

0 commit comments

Comments
 (0)