Skip to content

Commit 4206f92

Browse files
authored
Merge branch 'dev' into feat_support_template_id_serverlessspark_taskplugin
2 parents 5e691c3 + 2f57e05 commit 4206f92

File tree

447 files changed

+8472
-5224
lines changed

Some content is hidden

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

447 files changed

+8472
-5224
lines changed

.asf.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,18 @@ github:
5353
required_pull_request_reviews:
5454
dismiss_stale_reviews: true
5555
required_approving_review_count: 2
56+
features:
57+
# Enable issues management
58+
issues: true
59+
# Enable projects for project management boards
60+
projects: false
61+
# Enable wiki for documentation
62+
wiki: false
63+
# Enable discussions
64+
discussions: true
65+
66+
notifications:
67+
commits: commits@dolphinscheduler.apache.org
68+
issues: commits@dolphinscheduler.apache.org
69+
pullrequests: commits@dolphinscheduler.apache.org
70+
discussions: commits@dolphinscheduler.apache.org

.dlc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
"timeout": "10s",
3535
"retryOn429": true,
3636
"retryCount": 10,
37-
"fallbackRetryDelay": "1000s",
37+
"fallbackRetryDelay": "10s",
3838
"aliveStatusCodes": [200, 401, 403, 0]
3939
}

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ body:
101101
- dev
102102
- 3.1.x
103103
- 3.2.x
104+
- 3.3.0-alpha
104105
validations:
105106
required: true
106107

.github/workflows/api-test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
not-ignore: ${{ steps.filter.outputs.not-ignore }}
3939
steps:
4040
- uses: actions/checkout@v4
41-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
41+
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
4242
id: filter
4343
with:
4444
filters: |
@@ -82,7 +82,9 @@ jobs:
8282
./mvnw -B clean install \
8383
-Dmaven.test.skip=true \
8484
-Dspotless.skip=true \
85-
-Pdocker,staging -Ddocker.tag=ci
85+
-Pdocker,staging \
86+
-Ddocker.tag=ci \
87+
-Danalyze.skip=true
8688
- name: Export Docker Images
8789
run: |
8890
docker save apache/dolphinscheduler-standalone-server:ci -o /tmp/standalone-image.tar \

.github/workflows/backend.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
db-schema: ${{ steps.filter.outputs.db-schema }}
3939
steps:
4040
- uses: actions/checkout@v4
41-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
41+
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
4242
id: filter
4343
with:
4444
filters: |
@@ -91,7 +91,8 @@ jobs:
9191
./mvnw -B clean install \
9292
-Pstaging \
9393
-Dmaven.test.skip=true \
94-
-Dspotless.skip=true
94+
-Dspotless.skip=true \
95+
-Danalyze.skip=true
9596
- name: Check dependency license
9697
run: tools/dependencies/check-LICENSE.sh
9798
- uses: actions/upload-artifact@v4

.github/workflows/docs.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,38 @@ jobs:
6161
uses: ./.github/actions/workflow-telemetry-action
6262
with:
6363
comment_on_pr: false
64-
- run: sudo npm install -g markdown-link-check@3.11.2
65-
- run: sudo apt install plocate -y
64+
- run: sudo npm install -g markdown-link-check@3.13.7
65+
- run: sudo apt install plocate -y && sudo updatedb
6666
# NOTE: Change command from `find . -name "*.md"` to `find . -not -path "*/node_modules/*" -not -path "*/.tox/*" -name "*.md"`
6767
# if you want to run check locally
68-
- run: |
68+
- name: Check Dead Links
69+
run: |
70+
set -xe
71+
MAX_CONCURRENCY=6
72+
EXIT_CODE=0
73+
74+
cleanup() {
75+
pkill -P $$
76+
exit "$EXIT_CODE"
77+
}
78+
79+
trap cleanup SIGINT SIGTERM
80+
6981
for file in $(locate "$PWD*/*.md" | grep -v ./deploy/terraform/aws/README.md | grep -v ./.github); do
82+
while [ $(jobs -r | wc -l) -ge "$MAX_CONCURRENCY" ]; do
83+
wait -n || { EXIT_CODE=$?; cleanup; }
84+
done
7085
markdown-link-check -c .dlc.json -q "$file" &
7186
done
72-
wait
87+
wait || { EXIT_CODE=$?; cleanup; }
7388
paths-filter:
7489
name: Helm-Doc-Path-Filter
7590
runs-on: ubuntu-latest
7691
outputs:
7792
helm-doc: ${{ steps.filter.outputs.helm-doc }}
7893
steps:
7994
- uses: actions/checkout@v4
80-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
95+
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
8196
id: filter
8297
with:
8398
filters: |

.github/workflows/e2e-k8s.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
not-ignore: ${{ steps.filter.outputs.not-ignore }}
3939
steps:
4040
- uses: actions/checkout@v4
41-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
41+
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
4242
id: filter
4343
with:
4444
filters: |
@@ -72,7 +72,9 @@ jobs:
7272
./mvnw -B clean package \
7373
-Dmaven.test.skip=true \
7474
-Dspotless.skip=true \
75-
-Pdocker,staging -Ddocker.tag=ci
75+
-Pdocker,staging \
76+
-Ddocker.tag=ci \
77+
-Danalyze.skip=true
7678
- name: Create k8s Kind Cluster
7779
run: |
7880
# install kubectl

.github/workflows/e2e.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
not-ignore: ${{ steps.filter.outputs.not-ignore }}
4141
steps:
4242
- uses: actions/checkout@v4
43-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
43+
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
4444
id: filter
4545
with:
4646
filters: |
@@ -84,7 +84,9 @@ jobs:
8484
./mvnw -B clean install \
8585
-Dmaven.test.skip=true \
8686
-Dspotless.skip=true \
87-
-Pdocker,staging -Ddocker.tag=ci
87+
-Pdocker,staging \
88+
-Ddocker.tag=ci \
89+
-Danalyze.skip=true
8890
- name: Export Docker Images
8991
run: |
9092
docker save apache/dolphinscheduler-standalone-server:ci -o /tmp/standalone-image.tar \
@@ -146,6 +148,19 @@ jobs:
146148
env:
147149
RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
148150
steps:
151+
- uses: actions/checkout@v4
152+
with:
153+
submodules: true
154+
- name: Maximize runner space
155+
uses: ./.github/actions/maximize-build-space
156+
with:
157+
root-reserve-mb: 30720
158+
temp-reserve-mb: 10240
159+
remove-dotnet: 'true'
160+
remove-android: 'true'
161+
remove-haskell: 'true'
162+
remove-codeql: 'true'
163+
remove-docker-images: 'true'
149164
- uses: actions/checkout@v4
150165
with:
151166
submodules: true

.github/workflows/frontend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
not-ignore: ${{ steps.filter.outputs.not-ignore }}
4444
steps:
4545
- uses: actions/checkout@v4
46-
- uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
46+
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
4747
id: filter
4848
with:
4949
filters: |

.github/workflows/owasp-dependency-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ jobs:
3939
- uses: actions/checkout@v4
4040
with:
4141
submodules: true
42-
- name: Set up JDK 8
42+
- name: Set up JDK 11
4343
uses: actions/setup-java@v4
4444
with:
45-
java-version: 8
45+
java-version: 11
4646
distribution: 'adopt'
4747
- name: Run OWASP Dependency Check
4848
run: |

0 commit comments

Comments
 (0)