Skip to content

Commit 21dd606

Browse files
Merge branch '25_2' into speechtotext-overview-demo-description-25-2
2 parents 530eb06 + 7e18f43 commit 21dd606

File tree

2,171 files changed

+8629
-8047
lines changed

Some content is hidden

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

2,171 files changed

+8629
-8047
lines changed

.github/workflows/demos_visual_tests_frameworks.yml

Lines changed: 80 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,12 @@ jobs:
134134
# run: pnpm install
135135

136136
- name: Prepare bundles
137+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'force all tests')
137138
working-directory: apps/demos
138139
run: pnpx nx prepare-bundles
139140

140141
- name: Demos - Run tsc
142+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'force all tests')
141143
working-directory: apps/demos
142144
run: tsc --noEmit
143145

@@ -151,6 +153,7 @@ jobs:
151153

152154
get-changes:
153155
runs-on: ubuntu-22.04
156+
if: github.event_name == 'pull_request'
154157
name: Get changed demos
155158
timeout-minutes: 5
156159

@@ -160,12 +163,22 @@ jobs:
160163

161164
- name: Get changed files
162165
uses: DevExpress/github-actions/get-changed-files@v1
163-
if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'force all tests')
164166
with:
165167
gh-token: ${{ secrets.GITHUB_TOKEN }}
166168
paths: 'apps/demos/Demos/**/*'
167169
output: apps/demos/changed-files.json
168170

171+
- name: Display changed files
172+
run: |
173+
if [ -f "apps/demos/changed-files.json" ]; then
174+
echo "Found changed-files.json"
175+
echo "Content of changed-files.json:"
176+
cat apps/demos/changed-files.json
177+
echo "Number of changed files: $(jq length apps/demos/changed-files.json)"
178+
else
179+
echo "changed-files.json not found"
180+
fi
181+
169182
- name: Upload artifacts
170183
uses: actions/upload-artifact@v4
171184
with:
@@ -234,7 +247,6 @@ jobs:
234247
name: Lint code base
235248
needs:
236249
- build-devextreme
237-
- get-changes
238250

239251
runs-on: ubuntu-22.04
240252
timeout-minutes: 60
@@ -244,7 +256,7 @@ jobs:
244256
uses: actions/checkout@v4
245257

246258
- name: Download artifacts
247-
if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'force all tests')
259+
if: github.event_name == 'pull_request'
248260
uses: actions/download-artifact@v4
249261
with:
250262
name: changed-demos
@@ -285,47 +297,66 @@ jobs:
285297
- name: Install tgz
286298
run: pnpm add -w ./devextreme-installer.tgz ./devextreme-dist-installer.tgz ./devextreme-react-installer.tgz ./devextreme-vue-installer.tgz ./devextreme-angular-installer.tgz
287299

288-
- uses: actions/setup-dotnet@v4
289-
with:
290-
dotnet-version: 5.0.408
291-
292-
- name: Prepare dotnet
293-
run: |
294-
dotnet new globaljson --sdk-version 5.0.408
295-
dotnet tool install -g dotnet-format --version 5.1.225507
296-
297-
- name: Run lint
300+
- name: Run lint on all demos
301+
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'force all tests')
298302
working-directory: apps/demos
299303
env:
300-
CHANGEDFILEINFOSPATH: changed-files.json
301304
DEBUG: 'eslint:cli-engine,stylelint:standalone'
302305
run: pnpx nx lint
303306

307+
- name: Run lint on changed demos
308+
if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'force all tests')
309+
working-directory: apps/demos
310+
env:
311+
DEBUG: 'eslint:cli-engine,stylelint:standalone'
312+
run: |
313+
pnpx nx lint-non-demos
314+
315+
if [ -f "changed-files.json" ]; then
316+
echo "Running lint-demos on changed files"
317+
CHANGED_DEMOS=$(jq -r '.[].filename' changed-files.json \
318+
| grep '^apps/demos/Demos/' \
319+
| sed 's|^apps/demos/||' \
320+
| while read f; do
321+
[ -f "$f" ] && echo "$f"
322+
done \
323+
| tr '\n' ' ')
324+
if [ ! -z "$CHANGED_DEMOS" ]; then
325+
echo "Changed demo files: $CHANGED_DEMOS"
326+
pnpx eslint $CHANGED_DEMOS
327+
else
328+
echo "No demo files changed, skipping lint-demos"
329+
fi
330+
else
331+
echo "changed-files.json not found"
332+
pnpm run lint-demos
333+
fi
334+
304335
check_generated_demos:
305336
name: ${{ matrix.name }}
306337
runs-on: ubuntu-22.04
307338
timeout-minutes: 10
308-
needs: build-demos
339+
needs:
340+
- build-devextreme
309341

310342
strategy:
311343
fail-fast: false
312344
matrix:
313345
include:
314-
- name: Check generated demos (1/5)
315-
command: CONSTEL=1/5 pnpm run convert-to-js
316-
- name: Check generated demos (2/5)
317-
command: CONSTEL=2/5 pnpm run convert-to-js
318-
- name: Check generated demos (3/5)
319-
command: CONSTEL=3/5 pnpm run convert-to-js
320-
- name: Check generated demos (4/5)
321-
command: CONSTEL=4/5 pnpm run convert-to-js
322-
- name: Check generated demos (5/5)
323-
command: CONSTEL=5/5 pnpm run convert-to-js
346+
- name: Check generated demos
347+
command: pnpm run convert-to-js
324348

325349
steps:
326350
- name: Get sources
327351
uses: actions/checkout@v4
328352

353+
- name: Download artifacts
354+
if: github.event_name == 'pull_request'
355+
uses: actions/download-artifact@v4
356+
with:
357+
name: changed-demos
358+
path: apps/demos
359+
329360
- uses: pnpm/action-setup@v4
330361
with:
331362
run_install: false
@@ -336,21 +367,6 @@ jobs:
336367
node-version: '20'
337368
cache: 'pnpm'
338369

339-
# - name: Get pnpm store directory
340-
# shell: bash
341-
# run: |
342-
# echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
343-
#
344-
# - uses: actions/cache@v4
345-
# name: Setup pnpm cache
346-
# with:
347-
# path: |
348-
# ${{ env.STORE_PATH }}
349-
# .nx/cache
350-
# key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
351-
# restore-keys: |
352-
# ${{ runner.os }}-pnpm-store
353-
354370
- name: Download devextreme sources
355371
uses: actions/download-artifact@v4
356372
with:
@@ -368,9 +384,31 @@ jobs:
368384
run: pnpm run prepare-js
369385

370386
- name: Check generated JS demos
387+
if: github.event_name == 'pull_request'
371388
working-directory: apps/demos
372389
run: |
373-
${{ matrix.command }}
390+
if [ -f "changed-files.json" ]; then
391+
echo "Running convert-to-js on changed files only"
392+
393+
CHANGED_DEMOS=$(jq -r '.[].filename' changed-files.json | grep '/React/' | grep '\.tsx$' | sed 's|^apps/demos/||' | sed 's|/[^/]*\.tsx$||' | sort | uniq)
394+
395+
if [ -z "$CHANGED_DEMOS" ]; then
396+
echo "No React demos found in changed files, skipping conversion"
397+
else
398+
echo "Changed React demos:"
399+
echo "$CHANGED_DEMOS"
400+
401+
echo "$CHANGED_DEMOS" | while read -r demo_dir; do
402+
if [ ! -z "$demo_dir" ]; then
403+
echo "Converting: $demo_dir"
404+
pnpm run convert-to-js "$demo_dir"
405+
fi
406+
done
407+
fi
408+
else
409+
echo "Running convert-to-js on all files"
410+
${{ matrix.command }}
411+
fi
374412
375413
git add ./Demos -N
376414
@@ -384,6 +422,7 @@ jobs:
384422
385423
testcafe:
386424
needs: build-demos
425+
if: contains(github.event.pull_request.labels.*.name, 'force all tests')
387426
strategy:
388427
fail-fast: false
389428
matrix:
@@ -414,13 +453,6 @@ jobs:
414453
with:
415454
name: devextreme-sources
416455

417-
- name: Download artifacts
418-
if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'force all tests')
419-
uses: actions/download-artifact@v4
420-
with:
421-
name: changed-demos
422-
path: apps/demos
423-
424456
- uses: pnpm/action-setup@v4
425457
with:
426458
run_install: false
@@ -447,9 +479,6 @@ jobs:
447479
working-directory: apps/demos
448480
run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
449481

450-
# - name: Build wrappers
451-
# run: pnpm exec nx run-many -t pack -p devextreme-angular devextreme-react devetreme-vue
452-
453482
- name: Prepare JS
454483
working-directory: apps/demos
455484
run: pnpm run prepare-js

.github/workflows/pr-filter-stubs.yml

Lines changed: 12 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -180,147 +180,84 @@ jobs:
180180
- run: exit 1
181181
# testcafe_tests.yml
182182
testcafe_tests_accessibility_1:
183-
name: 'accessibility (1/7)'
183+
name: 'accessibility (1/4)'
184184
needs: [ changesSegregation ]
185185
if: false
186186
runs-on: ubuntu-latest
187187
steps:
188188
- run: exit 1
189189
testcafe_tests_accessibility_2:
190-
name: 'accessibility (2/7)'
190+
name: 'accessibility (2/4)'
191191
needs: [ changesSegregation ]
192192
if: false
193193
runs-on: ubuntu-latest
194194
steps:
195195
- run: exit 1
196196
testcafe_tests_accessibility_3:
197-
name: 'accessibility (3/7)'
197+
name: 'accessibility (3/4)'
198198
needs: [ changesSegregation ]
199199
if: false
200200
runs-on: ubuntu-latest
201201
steps:
202202
- run: exit 1
203203
testcafe_tests_accessibility_4:
204-
name: 'accessibility (4/7)'
205-
needs: [ changesSegregation ]
206-
if: false
207-
runs-on: ubuntu-latest
208-
steps:
209-
- run: exit 1
210-
testcafe_tests_accessibility_5:
211-
name: 'accessibility (5/7)'
212-
needs: [ changesSegregation ]
213-
if: false
214-
runs-on: ubuntu-latest
215-
steps:
216-
- run: exit 1
217-
testcafe_tests_accessibility_6:
218-
name: 'accessibility (6/7)'
219-
needs: [ changesSegregation ]
220-
if: false
221-
runs-on: ubuntu-latest
222-
steps:
223-
- run: exit 1
224-
testcafe_tests_accessibility_7:
225-
name: 'accessibility (7/7)'
204+
name: 'accessibility (4/4)'
226205
needs: [ changesSegregation ]
227206
if: false
228207
runs-on: ubuntu-latest
229208
steps:
230209
- run: exit 1
231210
testcafe_tests6:
232-
name: 'accessibility - material (1/7)'
211+
name: 'accessibility - material (1/4)'
233212
needs: [ changesSegregation ]
234213
if: false
235214
runs-on: ubuntu-latest
236215
steps:
237216
- run: exit 1
238217
testcafe_tests7:
239-
name: 'accessibility - material (2/7)'
218+
name: 'accessibility - material (2/4)'
240219
needs: [ changesSegregation ]
241220
if: false
242221
runs-on: ubuntu-latest
243222
steps:
244223
- run: exit 1
245224
testcafe_tests8:
246-
name: 'accessibility - material (3/7)'
225+
name: 'accessibility - material (3/4)'
247226
needs: [ changesSegregation ]
248227
if: false
249228
runs-on: ubuntu-latest
250229
steps:
251230
- run: exit 1
252231
testcafe_tests9:
253-
name: 'accessibility - material (4/7)'
254-
needs: [ changesSegregation ]
255-
if: false
256-
runs-on: ubuntu-latest
257-
steps:
258-
- run: exit 1
259-
testcafe_tests10:
260-
name: 'accessibility - material (5/7)'
261-
needs: [ changesSegregation ]
262-
if: false
263-
runs-on: ubuntu-latest
264-
steps:
265-
- run: exit 1
266-
testcafe_tests11:
267-
name: 'accessibility - material (6/7)'
268-
needs: [ changesSegregation ]
269-
if: false
270-
runs-on: ubuntu-latest
271-
steps:
272-
- run: exit 1
273-
testcafe_tests12:
274-
name: 'accessibility - material (7/7)'
232+
name: 'accessibility - material (4/4)'
275233
needs: [ changesSegregation ]
276234
if: false
277235
runs-on: ubuntu-latest
278236
steps:
279237
- run: exit 1
280238
testcafe_tests13:
281-
name: 'accessibility - fluent (1/7)'
239+
name: 'accessibility - fluent (1/4)'
282240
needs: [ changesSegregation ]
283241
if: false
284242
runs-on: ubuntu-latest
285243
steps:
286244
- run: exit 1
287245
testcafe_tests14:
288-
name: 'accessibility - fluent (2/7)'
246+
name: 'accessibility - fluent (2/4)'
289247
needs: [ changesSegregation ]
290248
if: false
291249
runs-on: ubuntu-latest
292250
steps:
293251
- run: exit 1
294252
testcafe_tests15:
295-
name: 'accessibility - fluent (3/7)'
253+
name: 'accessibility - fluent (3/4)'
296254
needs: [ changesSegregation ]
297255
if: false
298256
runs-on: ubuntu-latest
299257
steps:
300258
- run: exit 1
301259
testcafe_tests16:
302-
name: 'accessibility - fluent (4/7)'
303-
needs: [ changesSegregation ]
304-
if: false
305-
runs-on: ubuntu-latest
306-
steps:
307-
- run: exit 1
308-
testcafe_tests17:
309-
name: 'accessibility - fluent (5/7)'
310-
needs: [ changesSegregation ]
311-
if: false
312-
runs-on: ubuntu-latest
313-
steps:
314-
- run: exit 1
315-
testcafe_tests18:
316-
name: 'accessibility - fluent (6/7)'
317-
needs: [ changesSegregation ]
318-
if: false
319-
runs-on: ubuntu-latest
320-
steps:
321-
- run: exit 1
322-
testcafe_tests19:
323-
name: 'accessibility - fluent (7/7)'
260+
name: 'accessibility - fluent (4/4)'
324261
needs: [ changesSegregation ]
325262
if: false
326263
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)