Skip to content

Commit eaba128

Browse files
Merge branch 'dev' into Improvement-Metrics
2 parents 8aa9d10 + c897b64 commit eaba128

140 files changed

Lines changed: 225 additions & 6353 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/backend.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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:

.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.

docs/docs/en/guide/start/docker.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ $ tar -zxf apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src.tar.gz
4646
# Going to docker-compose's location
4747
# For Mac or Linux users
4848
$ cd apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src/deploy/docker
49-
# For Windows users, you should run command `cd apache-dolphinscheduler-"${DOLPHINSCHEDULER_VERSION}"-src\deploy\docker`
50-
5149
# Initialize the database, use profile schema
5250
$ docker-compose --profile schema up -d
5351

docs/docs/zh/contribute/join/document.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,7 @@ git clone https://github.com/<your-github-user-name>/dolphinscheduler-website
2222
- 运行 `./scripts/prepare_docs.sh` 准备所有相关资源
2323
3. 在根目录下运行 `yarn generate` 来格式化和准备数据。
2424
4. 在根目录下运行 `yarn dev` 启动本地服务器,你可以在 http://localhost:3000 查看网站。
25-
26-
```
27-
注意:如果您在 Windows 而非 Mac 或 Linux 中克隆代码。请阅读下面的详细信息。
28-
如果执行上述两个步骤中的命令,将出现异常 “UnhandledPromiseRejectionWarning.Error:”: Error: EPERM: operation not permitted, symlink ‘2.0.3’ -> ‘latest’".
29-
如果出现异常 “Can't resolve ‘antd’ in xxx”,你可以运行 `yarn add antd` 和 `yarn install`。
30-
因为这两个步骤运行的命令`./scripts/prepare_docs.sh`应该是 Linux 环境,所以如果你是 Windows 系统,可以使用 WSL 来完成。
31-
遇到这个问题时。你可以以管理员身份运行 cmd.exe 中的两个步骤。
32-
```
33-
3425
5. 运行 `yarn build` 来构建源代码,此时会自动生成一个名为 `build` 的目录,等待执行完成后进入 `build` 目录。
35-
3626
6. 在本地验证你的更改:`python -m SimpleHTTPServer 8000`,当 Python 版本为 3 时,请使用:`python3 -m http.server 8000`
3727

3828
如果本地安装了更高版本的 Node,可以考虑使用 `nvm` 来允许不同版本的 Node 在你的计算机上运行。

docs/docs/zh/contribute/join/review.md

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,19 @@ Review Issues 是指在 GitHub 中参与 [Issues][all-issues] 的讨论,并在
3131

3232
除了个 issue 建议之外,给 Issue 分类也是非常重要的一个工作。分类后的 Issue 可以更好的被检索,为以后进一步处理提供便利。一个 Issue 可以被打上多个标签,常见的 Issue 分类有
3333

34-
| 标签 | 标签代表的情况 |
35-
|------------------------------------------|-----------------------|
36-
| [UI][label-ui] | UI 以及前端相关的 Issue |
37-
| [security][label-security] | 安全相关的 Issue |
38-
| [user experience][label-user-experience] | 用户体验相关的 Issue |
39-
| [development][label-development] | 开发者相关的 Issue |
40-
| [Python][label-python] | Python 相关的 Issue |
41-
| [plug-in][label-plug-in] | 插件相关的 Issue |
42-
| [document][label-document] | 文档相关的 Issue |
43-
| [docker][label-docker] | docker 相关的 Issue |
44-
| [need verify][label-need-verify] | Issue 需要被验证 |
45-
| [e2e][label-e2e] | e2e 相关的 Issue |
46-
| [win-os][label-win-os] | windows 操作系统相关的 Issue |
47-
| [suggestion][label-suggestion] | Issue 为项目提出了建议 |
34+
| 标签 | 标签代表的情况 |
35+
|------------------------------------------|------------------|
36+
| [UI][label-ui] | UI 以及前端相关的 Issue |
37+
| [security][label-security] | 安全相关的 Issue |
38+
| [user experience][label-user-experience] | 用户体验相关的 Issue |
39+
| [development][label-development] | 开发者相关的 Issue |
40+
| [Python][label-python] | Python 相关的 Issue |
41+
| [plug-in][label-plug-in] | 插件相关的 Issue |
42+
| [document][label-document] | 文档相关的 Issue |
43+
| [docker][label-docker] | docker 相关的 Issue |
44+
| [need verify][label-need-verify] | Issue 需要被验证 |
45+
| [e2e][label-e2e] | e2e 相关的 Issue |
46+
| [suggestion][label-suggestion] | Issue 为项目提出了建议 |
4847

4948
标签除了分类之外,还能区分 Issue 的优先级,优先级越高的标签越重要,越容易被重视,并会尽快被修复或者实现,优先级的标签如下
5049

docs/docs/zh/guide/demo.md

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

0 commit comments

Comments
 (0)