Skip to content

Commit 002ec8c

Browse files
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into 25_2_angular_19
# Conflicts: # apps/demos/Demos/Scheduler/Templates/Angular/app/app.component.ts # pnpm-lock.yaml
2 parents 330cc50 + 4feac3e commit 002ec8c

File tree

7,926 files changed

+194794
-53527
lines changed

Some content is hidden

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

7,926 files changed

+194794
-53527
lines changed

.github/actions/run-qunit-tests/action.yml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ inputs:
2525
useCsp:
2626
description: "Indicates if tests should run with Content Security Policy (CSP) enabled"
2727
default: "true"
28+
maxWorkers:
29+
description: "Maximum number of parallel test workers"
30+
default: ""
2831

2932
runs:
3033
using: composite
@@ -36,23 +39,15 @@ runs:
3639
echo "MATRIX_ENVS_NAME_SAFE=$MATRIX_ENVS_NAME_SAFE"
3740
echo "MATRIX_ENVS_NAME_SAFE=$MATRIX_ENVS_NAME_SAFE" >> $GITHUB_ENV
3841
39-
# - name: Update apt
40-
# run: |
41-
# sudo apt-get update
42-
43-
# - name: Setup utils
44-
# run: |
45-
# sudo apt-get install -y dbus-x11 httping x11vnc xvfb
42+
# - name: Setup Chrome
43+
# uses: ./.github/actions/setup-chrome-headless-shell
44+
# with:
45+
# chrome-version: '141.0.7390.122'
4646

47-
- name: Setup Chrome
48-
uses: ./.github/actions/setup-chrome-headless-shell
49-
with:
50-
chrome-version: '141.0.7390.122'
51-
52-
- name: Use Node.js
53-
uses: actions/setup-node@v4
54-
with:
55-
node-version: '20'
47+
# - name: Use Node.js
48+
# uses: actions/setup-node@v4
49+
# with:
50+
# node-version: '20'
5651

5752
- name: Download artifacts
5853
uses: actions/download-artifact@v4
@@ -101,22 +96,21 @@ runs:
10196
env:
10297
CONSTEL: ${{ inputs.constel }}
10398
JQUERY: ${{ inputs.useJQuery }}
104-
MOBILE_UA: ${{ inputs.userAgent }}
10599
SHADOW_DOM: ${{ inputs.useShadowDom }}
106100
TZ: ${{ inputs.timezone }}
107101
NO_HEADLESS: ${{ inputs.headless == 'false' && 'true' || 'false' }}
108102
NO_CSP: ${{ inputs.useCsp == 'false' && 'true' || 'false' }}
109103
NORENOVATION: "false"
110104
GITHUBACTION: "true"
111105
TARGET: "test"
112-
DISPLAY: ":99"
113106
CHROME_CMD: ${{ env.CHROME_SHELL }}
107+
MAX_WORKERS: ${{ inputs.maxWorkers }}
114108
run: |
115109
chmod +x ./docker-ci.sh
116110
./docker-ci.sh
117111
118112
- name: Copy RawLog.txt
119-
if: ${{ failure() }}
113+
if: ${{ always() }}
120114
uses: actions/upload-artifact@v4
121115
with:
122116
name: RawLog-${{ env.MATRIX_ENVS_NAME_SAFE }}

.github/copilot-instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,10 @@ npm run lint-staged
251251
- Checks wrapper regeneration is up-to-date
252252
- Timeout: 20 minutes
253253

254-
**5. QUnit Tests (`.github/workflows/qunit_tests-renovation.yml`):**
254+
**5. QUnit Tests (`.github/workflows/qunit_tests.yml`):**
255255
- Builds with `DEVEXTREME_TEST_CI=true`
256256
- Runs tests in parallel across multiple constellations
257-
- Timeout: 60 minutes
257+
- Timeout: 20 minutes
258258

259259
**6. TestCafe Tests (`.github/workflows/testcafe_tests.yml`):**
260260
- Accessibility tests across multiple themes

.github/instructions/API_conventions.instructions.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ When helping me write code or reviewing my existing code, please follow these sp
1313
-`createJsonParser` (not `createJSONParser`)
1414
-`apiEndpoint` (not `APIEndpoint`)
1515
- This applies to all acronyms regardless of length (DOM, HTML, JSON, API, etc.)
16+
- The exception is `AI`, which should always be capitalized fully (e.g., `AIIntegration`, `aiOptions`)
1617

1718
2. **JSDoc Format - Omit @type:**
1819
- Do not include the `@type` tag in JSDoc comments when the type is already indicated by TypeScript type annotation

0 commit comments

Comments
 (0)