Skip to content

Commit b058847

Browse files
sanjana2505006sanjana2505006
committed
Resolve merge conflicts
2 parents e46eb00 + d30bc4f commit b058847

539 files changed

Lines changed: 2505 additions & 80306 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/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--Thanks very much for contributing to Apache DolphinScheduler, we are happy that you want to help us improve DolphinScheduler! -->
22

33
## Was this PR generated or assisted by AI?
4+
45
<!--(Please answer YES or NO. If YES, please specify which parts were generated or assisted by AI)-->
56

67
## Purpose of the pull request

‎.github/actions/actions-workflow-metrics‎

‎.github/actions/paths-filter‎

Submodule paths-filter added at fbd0ab8

‎.github/actions/workflow-telemetry-action‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.github/workflows/api-test.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ jobs:
3737
outputs:
3838
not-ignore: ${{ steps.filter.outputs.not-ignore }}
3939
steps:
40-
- uses: actions/checkout@v4
41-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
40+
- uses: actions/checkout@v6
41+
with:
42+
submodules: true
43+
- uses: ./.github/actions/paths-filter
4244
id: filter
4345
with:
4446
filters: |
@@ -58,15 +60,15 @@ jobs:
5860
sudo docker image prune --all --force
5961
sudo docker builder prune -a
6062
- run: df -h
61-
- uses: actions/checkout@v4
63+
- uses: actions/checkout@v6
6264
with:
6365
submodules: true
6466
- name: Sanity Check
6567
uses: ./.github/actions/sanity-check
6668
with:
6769
token: ${{ secrets.GITHUB_TOKEN }}
6870
- name: Cache local Maven repository
69-
uses: actions/cache@v4
71+
uses: actions/cache@v5
7072
with:
7173
path: ~/.m2/repository
7274
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-api-test
@@ -83,7 +85,7 @@ jobs:
8385
run: |
8486
docker save apache/dolphinscheduler-standalone-server:ci -o /tmp/standalone-image.tar \
8587
&& du -sh /tmp/standalone-image.tar
86-
- uses: actions/upload-artifact@v4
88+
- uses: actions/upload-artifact@v6
8789
name: Upload Docker Images
8890
with:
8991
name: standalone-image-api-test
@@ -120,20 +122,18 @@ jobs:
120122
env:
121123
RECORDING_PATH: /tmp/recording-${{ matrix.case.name }}
122124
steps:
123-
- uses: actions/checkout@v4
125+
- uses: actions/checkout@v6
124126
with:
125127
submodules: true
126128
- name: Set up JDK 11
127-
uses: actions/setup-java@v4
129+
uses: actions/setup-java@v5
128130
with:
129131
java-version: 11
130132
distribution: 'adopt'
131-
- name: Collect Workflow Telemetry
132-
uses: ./.github/actions/workflow-telemetry-action
133-
with:
134-
comment_on_pr: false
133+
- name: Collect Workflow Metrics
134+
uses: ./.github/actions/actions-workflow-metrics
135135
- name: Cache local Maven repository
136-
uses: actions/cache@v4
136+
uses: actions/cache@v5
137137
with:
138138
path: ~/.m2/repository
139139
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-api-test
@@ -154,7 +154,7 @@ jobs:
154154
-DfailIfNoTests=false \
155155
-Dspotless.skip=true \
156156
-Dtest=${{ matrix.case.class }} test
157-
- uses: actions/upload-artifact@v4
157+
- uses: actions/upload-artifact@v6
158158
if: always()
159159
name: Upload Recording
160160
with:

‎.github/workflows/backend.yml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ jobs:
3737
not-ignore: ${{ steps.filter.outputs.not-ignore }}
3838
db-schema: ${{ steps.filter.outputs.db-schema }}
3939
steps:
40-
- uses: actions/checkout@v4
41-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
40+
- uses: actions/checkout@v6
41+
with:
42+
submodules: true
43+
- uses: ./.github/actions/paths-filter
4244
id: filter
4345
with:
4446
filters: |
@@ -56,19 +58,19 @@ jobs:
5658
java: [ '8', '11' ]
5759
timeout-minutes: 30
5860
steps:
59-
- uses: actions/checkout@v4
61+
- uses: actions/checkout@v6
6062
with:
6163
submodules: true
6264
- name: Set up JDK ${{ matrix.java }}
63-
uses: actions/setup-java@v4
65+
uses: actions/setup-java@v5
6466
with:
6567
java-version: ${{ matrix.java }}
6668
distribution: 'adopt'
6769
- name: Sanity Check
6870
uses: ./.github/actions/sanity-check
6971
with:
7072
token: ${{ secrets.GITHUB_TOKEN }}
71-
- uses: actions/cache@v4
73+
- uses: actions/cache@v5
7274
with:
7375
path: ~/.m2/repository
7476
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-backend
@@ -83,7 +85,7 @@ jobs:
8385
-Danalyze.skip=true
8486
- name: Check dependency license
8587
run: tools/dependencies/check-LICENSE.sh
86-
- uses: actions/upload-artifact@v4
88+
- uses: actions/upload-artifact@v6
8789
if: ${{ matrix.java == '8' }}
8890
name: Upload Binary Package
8991
with:
@@ -114,13 +116,11 @@ jobs:
114116
sudo docker image prune --all --force
115117
sudo docker builder prune -a
116118
- run: df -h
117-
- uses: actions/checkout@v4
119+
- uses: actions/checkout@v6
118120
with:
119121
submodules: true
120-
- name: Collect Workflow Telemetry
121-
uses: ./.github/actions/workflow-telemetry-action
122-
with:
123-
comment_on_pr: false
122+
- name: Collect Workflow Metrics
123+
uses: ./.github/actions/actions-workflow-metrics
124124
- uses: actions/download-artifact@v4
125125
name: Download Binary Package
126126
with:
@@ -145,13 +145,11 @@ jobs:
145145
- name: schema-check-with-postgresql
146146
script: .github/workflows/schema-check/postgresql/start-job.sh
147147
steps:
148-
- uses: actions/checkout@v4
148+
- uses: actions/checkout@v6
149149
with:
150150
submodules: true
151-
- name: Collect Workflow Telemetry
152-
uses: ./.github/actions/workflow-telemetry-action
153-
with:
154-
comment_on_pr: false
151+
- name: Collect Workflow Metrics
152+
uses: ./.github/actions/actions-workflow-metrics
155153
- name: Download Binary Package
156154
uses: actions/download-artifact@v4
157155
with:

‎.github/workflows/docs.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
timeout-minutes: 10
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v6
3434
- name: Style Check
3535
run: ./mvnw spotless:check
3636
img-check:
@@ -40,7 +40,7 @@ jobs:
4040
run:
4141
working-directory: docs
4242
steps:
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v6
4444
- name: Set up Python 3.9
4545
uses: actions/setup-python@v2
4646
with:
@@ -54,13 +54,11 @@ jobs:
5454
runs-on: ubuntu-latest
5555
timeout-minutes: 30
5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v6
5858
with:
5959
submodules: true
60-
- name: Collect Workflow Telemetry
61-
uses: ./.github/actions/workflow-telemetry-action
62-
with:
63-
comment_on_pr: false
60+
- name: Collect Workflow Metrics
61+
uses: ./.github/actions/actions-workflow-metrics
6462
- run: sudo snap install lychee
6563
- name: Check Dead Links
6664
run: |
@@ -72,8 +70,10 @@ jobs:
7270
outputs:
7371
helm-doc: ${{ steps.filter.outputs.helm-doc }}
7472
steps:
75-
- uses: actions/checkout@v4
76-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
73+
- uses: actions/checkout@v6
74+
with:
75+
submodules: true
76+
- uses: ./.github/actions/paths-filter
7777
id: filter
7878
with:
7979
filters: |
@@ -86,7 +86,7 @@ jobs:
8686
runs-on: ubuntu-latest
8787
timeout-minutes: 20
8888
steps:
89-
- uses: actions/checkout@v4
89+
- uses: actions/checkout@v6
9090
with:
9191
submodules: true
9292
- name: Generating helm-doc

‎.github/workflows/e2e-k8s.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ jobs:
3737
outputs:
3838
not-ignore: ${{ steps.filter.outputs.not-ignore }}
3939
steps:
40-
- uses: actions/checkout@v4
41-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
40+
- uses: actions/checkout@v6
41+
with:
42+
submodules: true
43+
- uses: ./.github/actions/paths-filter
4244
id: filter
4345
with:
4446
filters: |
@@ -58,7 +60,7 @@ jobs:
5860
sudo docker image prune --all --force
5961
sudo docker builder prune -a
6062
- run: df -h
61-
- uses: actions/checkout@v4
63+
- uses: actions/checkout@v6
6264
with:
6365
submodules: true
6466
- run: df -h

‎.github/workflows/e2e.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ jobs:
3939
outputs:
4040
not-ignore: ${{ steps.filter.outputs.not-ignore }}
4141
steps:
42-
- uses: actions/checkout@v4
43-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
42+
- uses: actions/checkout@v6
43+
with:
44+
submodules: true
45+
- uses: ./.github/actions/paths-filter
4446
id: filter
4547
with:
4648
filters: |
@@ -53,15 +55,15 @@ jobs:
5355
runs-on: ubuntu-latest
5456
timeout-minutes: 20
5557
steps:
56-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v6
5759
with:
5860
submodules: true
5961
- name: Sanity Check
6062
uses: ./.github/actions/sanity-check
6163
with:
6264
token: ${{ secrets.GITHUB_TOKEN }}
6365
- name: Cache local Maven repository
64-
uses: actions/cache@v4
66+
uses: actions/cache@v5
6567
with:
6668
path: ~/.m2/repository
6769
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-e2e
@@ -78,7 +80,7 @@ jobs:
7880
run: |
7981
docker save apache/dolphinscheduler-standalone-server:ci -o /tmp/standalone-image.tar \
8082
&& du -sh /tmp/standalone-image.tar
81-
- uses: actions/upload-artifact@v4
83+
- uses: actions/upload-artifact@v6
8284
name: Upload Docker Images
8385
with:
8486
name: standalone-image-e2e
@@ -140,29 +142,27 @@ jobs:
140142
- run: df -h
141143
- name: "node-cleanup"
142144
run: |
143-
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
144-
sudo docker image prune --all --force
145-
sudo docker builder prune -a
145+
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
146+
sudo docker image prune --all --force
147+
sudo docker builder prune -a
146148
- run: df -h
147-
- uses: actions/checkout@v4
149+
- uses: actions/checkout@v6
148150
with:
149151
submodules: true
150152
- name: Set up JDK 11
151-
uses: actions/setup-java@v4
153+
uses: actions/setup-java@v5
152154
with:
153155
java-version: 11
154156
distribution: 'adopt'
155-
- name: Collect Workflow Telemetry
156-
uses: ./.github/actions/workflow-telemetry-action
157-
with:
158-
comment_on_pr: false
157+
- name: Collect Workflow Metrics
158+
uses: ./.github/actions/actions-workflow-metrics
159159
- name: Cache local Maven repository
160-
uses: actions/cache@v4
160+
uses: actions/cache@v5
161161
with:
162162
path: ~/.m2/repository
163163
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-e2e
164164
restore-keys: ${{ runner.os }}-maven-
165-
- uses: actions/download-artifact@v4
165+
- uses: actions/download-artifact@v8
166166
name: Download Docker Images
167167
with:
168168
name: standalone-image-e2e
@@ -176,7 +176,7 @@ jobs:
176176
./mvnw -B -f dolphinscheduler-e2e/pom.xml -am \
177177
-DfailIfNoTests=false \
178178
-Dtest=${{ matrix.case.class }} test
179-
- uses: actions/upload-artifact@v4
179+
- uses: actions/upload-artifact@v6
180180
if: always()
181181
name: Upload Recording
182182
with:

‎.github/workflows/frontend.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ jobs:
4242
outputs:
4343
not-ignore: ${{ steps.filter.outputs.not-ignore }}
4444
steps:
45-
- uses: actions/checkout@v4
46-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
45+
- uses: actions/checkout@v6
46+
with:
47+
submodules: true
48+
- uses: ./.github/actions/paths-filter
4749
id: filter
4850
with:
4951
filters: |
@@ -59,7 +61,7 @@ jobs:
5961
matrix:
6062
os: [ ubuntu-latest, macos-latest ]
6163
steps:
62-
- uses: actions/checkout@v4
64+
- uses: actions/checkout@v6
6365
with:
6466
submodules: true
6567
- if: matrix.os == 'ubuntu-latest'
@@ -90,7 +92,7 @@ jobs:
9092
needs: [ build, paths-filter ]
9193
if: always()
9294
steps:
93-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@v6
9496
- name: Status
9597
run: |
9698
if [[ ${{ needs.paths-filter.outputs.not-ignore }} == 'false' && ${{ github.event_name }} == 'pull_request' ]]; then

0 commit comments

Comments
 (0)