Skip to content

Commit 83a0f5d

Browse files
Merge remote changes
2 parents 7469149 + 8001561 commit 83a0f5d

166 files changed

Lines changed: 1482 additions & 6403 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.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 & 3 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
@@ -136,7 +136,6 @@ jobs:
136136
runs-on: ubuntu-latest
137137
timeout-minutes: 20
138138
strategy:
139-
fail-fast: false
140139
matrix:
141140
version: ["3.1.9", "3.2.0", "3.3.1"]
142141
case:
@@ -151,7 +150,7 @@ jobs:
151150
- name: Collect Workflow Metrics
152151
uses: ./.github/actions/actions-workflow-metrics
153152
- name: Download Binary Package
154-
uses: actions/download-artifact@v4
153+
uses: actions/download-artifact@v8
155154
with:
156155
name: binary-package-8
157156
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

.github/workflows/unit-test.yml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,18 @@ jobs:
4949
not-ignore:
5050
- '!(docs/**)'
5151
52+
sanity-check:
53+
name: Sanity Check
54+
runs-on: ubuntu-latest
55+
steps:
56+
- uses: actions/checkout@v6
57+
with:
58+
submodules: true
59+
- name: Sanity Check
60+
uses: ./.github/actions/sanity-check
61+
with:
62+
token: ${{ secrets.GITHUB_TOKEN }}
63+
5264
generate-matrix:
5365
name: Generate Module Matrix
5466
runs-on: ubuntu-latest
@@ -84,11 +96,10 @@ jobs:
8496
8597
unit-test:
8698
name: Unit-Test (${{ matrix.module }} | Java ${{ matrix.java }})
87-
needs: [ paths-filter, generate-matrix ]
99+
needs: [ paths-filter, generate-matrix, sanity-check ]
88100
if: ${{ (needs.paths-filter.outputs.not-ignore == 'true') || (github.event_name == 'push') }}
89101
runs-on: ubuntu-latest
90102
strategy:
91-
fail-fast: false
92103
matrix:
93104
java: [ '8', '11' ]
94105
module: ${{ fromJSON(needs.generate-matrix.outputs.matrix).module }}
@@ -101,11 +112,6 @@ jobs:
101112
- name: Collect Workflow Metrics
102113
uses: ./.github/actions/actions-workflow-metrics
103114

104-
- name: Sanity Check
105-
uses: ./.github/actions/sanity-check
106-
with:
107-
token: ${{ secrets.GITHUB_TOKEN }}
108-
109115
- name: Set up JDK ${{ matrix.java }}
110116
uses: actions/setup-java@v5
111117
with:
@@ -165,7 +171,7 @@ jobs:
165171
name: SonarCloud Analysis
166172
runs-on: ubuntu-latest
167173
needs: [ paths-filter, unit-test ]
168-
if: ${{ always() && (needs.paths-filter.outputs.not-ignore == 'true' || github.event_name == 'push') }}
174+
if: ${{ needs.unit-test.result == 'success' }}
169175
timeout-minutes: 30
170176
steps:
171177
- uses: actions/checkout@v6
@@ -244,8 +250,8 @@ jobs:
244250
publish-test-results:
245251
name: Publish Test Results
246252
runs-on: ubuntu-latest
247-
needs: unit-test
248-
if: always()
253+
needs: [ paths-filter, unit-test ]
254+
if: ${{ needs.unit-test.result == 'success' }}
249255
steps:
250256
- name: Download all surefire reports
251257
uses: actions/download-artifact@v8
@@ -264,7 +270,7 @@ jobs:
264270
name: Unit Test
265271
runs-on: ubuntu-latest
266272
timeout-minutes: 5
267-
needs: [ unit-test, paths-filter, sonar ]
273+
needs: [ unit-test, paths-filter, sonar, sanity-check ]
268274
if: always()
269275
steps:
270276
- name: Status
@@ -273,6 +279,10 @@ jobs:
273279
echo "Skip Unit Test!"
274280
exit 0
275281
fi
282+
if [[ ${{ needs.sanity-check.result }} != 'success' ]]; then
283+
echo "Sanity Check Failed!"
284+
exit -1
285+
fi
276286
if [[ ${{ needs.unit-test.result }} != 'success' ]]; then
277287
echo "Unit Test Failed!"
278288
exit -1

docs/configs/docsdev.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,6 @@ export default {
474474
title: 'Expansion and Reduction',
475475
link: '/en-us/docs/dev/user_doc/guide/expansion-reduction.html',
476476
},
477-
{
478-
title: 'Demo',
479-
link: '/en-us/docs/dev/user_doc/guide/demo.html',
480-
},
481477
],
482478
},
483479
{
@@ -1186,10 +1182,6 @@ export default {
11861182
title: '扩/缩容',
11871183
link: '/zh-cn/docs/dev/user_doc/guide/expansion-reduction.html',
11881184
},
1189-
{
1190-
title: 'Demo',
1191-
link: '/zh-cn/docs/dev/user_doc/guide/demo.html',
1192-
},
11931185
],
11941186
},
11951187
{

docs/docs/en/contribute/join/document.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ git clone https://github.com/<your-github-user-name>/dolphinscheduler-website
2020
2.2. Run `./scripts/prepare_docs.sh` prepare all related resources, for more information you could see [how prepare script work](https://github.com/apache/dolphinscheduler-website/blob/master/HOW_PREPARE_WORK.md)
2121
3. Run `yarn generate` in the root directory to format and prepare the data.
2222
4. Run `yarn dev` in the root directory to start a local server, you will see the website in 'http://localhost:3000'.
23-
24-
```
25-
Note: if you clone the code in Windows, not Mac or Linux. Please read the details below.
26-
If you execute the commands like the two steps above, you will get the exception "UnhandledPromiseRejectionWarning: Error: EPERM: operation not permitted, symlink '2.0.3' -> 'latest'".
27-
If you get the exception "Can't resolve 'antd' in xxx",you can run `yarn add antd` and `yarn install`.
28-
Because the `./scripts/prepare_docs.sh` command requires a Linux environment, if you are on a Windows system, you can use WSL to complete this step.
29-
When you encounter this problem. You can run the two steps in cmd.exe as an administrator on your Windows system.
30-
```
31-
3223
5. Run `yarn build` to build source code, this will automatically generate a directory called `build`, wait for the execution to complete and into `build` directory.
3324
6. Verify your change locally: `python -m SimpleHTTPServer 8000`, when your python version is 3 use :`python3 -m http.server 8000` instead.
3425

docs/docs/en/contribute/join/review.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,19 @@ Review Issues means discuss [Issues][all-issues] in GitHub and give suggestions
3636
In addition give suggestion, add label for issue is also important during review. The labeled issues can be retrieved
3737
better, which convenient for further processing. An issue can with more than one label. Common issue categories are:
3838

39-
| Label | Meaning |
40-
|------------------------------------------|--------------------------------|
41-
| [UI][label-ui] | UI and front-end related |
42-
| [security][label-security] | Security Issue |
43-
| [user experience][label-user-experience] | User experience Issue |
44-
| [development][label-development] | Development Issue |
45-
| [Python][label-python] | Python Issue |
46-
| [plug-in][label-plug-in] | Plug-in Issue |
47-
| [document][label-document] | Document Issue |
48-
| [docker][label-docker] | Docker Issue |
49-
| [need verify][label-need-verify] | Need verify Issue |
50-
| [e2e][label-e2e] | E2E Issue |
51-
| [win-os][label-win-os] | windows operating system Issue |
52-
| [suggestion][label-suggestion] | Give suggestion to us |
39+
| Label | Meaning |
40+
|------------------------------------------|--------------------------|
41+
| [UI][label-ui] | UI and front-end related |
42+
| [security][label-security] | Security Issue |
43+
| [user experience][label-user-experience] | User experience Issue |
44+
| [development][label-development] | Development Issue |
45+
| [Python][label-python] | Python Issue |
46+
| [plug-in][label-plug-in] | Plug-in Issue |
47+
| [document][label-document] | Document Issue |
48+
| [docker][label-docker] | Docker Issue |
49+
| [need verify][label-need-verify] | Need verify Issue |
50+
| [e2e][label-e2e] | E2E Issue |
51+
| [suggestion][label-suggestion] | Give suggestion to us |
5352

5453
Beside classification, label could also set the priority of Issues. The higher the priority, the more attention pay
5554
in the community, the easier it is to be fixed or implemented. The priority label are as follows

docs/docs/en/guide/demo.md

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)