Skip to content

Commit bfbe0b7

Browse files
authored
Merge branch '26_1' into 26_1_T1330839
2 parents 9239cd3 + 6182090 commit bfbe0b7

33 files changed

Lines changed: 1656 additions & 843 deletions

.github/workflows/demos_unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
jobs:
1919
check-should-run:
2020
name: Check if tests should run
21-
runs-on: devextreme-shr2
21+
runs-on: ubuntu-latest
2222
outputs:
2323
should-run: ${{ steps.check.outputs.should-run }}
2424
steps:

.github/workflows/playgrounds_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131

132132
- name: Check sources compilation
133133
working-directory: ./apps/${{ matrix.ARGS.platform }}
134-
run: pnpm exec nx build
134+
run: pnpm exec nx build --excludeTaskDependencies
135135

136136
# - name: Run test
137137
# if: ${{ matrix.ARGS.platform != 'angular' }}

.github/workflows/qunit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
jobs:
2020
check-should-run-all:
2121
name: Check if all tests should run
22-
runs-on: devextreme-shr2
22+
runs-on: ubuntu-latest
2323
outputs:
2424
should-run: ${{ steps.check.outputs.should-run }}
2525
steps:

.github/workflows/themebuilder_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: Build etalon bundles
5454
working-directory: ./packages/devextreme-scss
55-
run: pnpm exec gulp style-compiler-themes-ci
55+
run: pnpm nx build:ci devextreme-scss
5656

5757
- name: Build
5858
working-directory: ./packages/devextreme-themebuilder

.github/workflows/visual-tests-demos.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
jobs:
2020
check-should-run:
2121
name: Check if tests should run
22-
runs-on: devextreme-shr2
22+
runs-on: ubuntu-latest
2323
outputs:
2424
should-run: ${{ steps.check.outputs.should-run }}
2525
steps:
@@ -28,7 +28,7 @@ jobs:
2828
run: echo "should-run=${{ env.RUN_TESTS }}" >> $GITHUB_OUTPUT
2929

3030
get-changes:
31-
runs-on: devextreme-shr2
31+
runs-on: ubuntu-latest
3232
needs: check-should-run
3333
if: github.event_name == 'pull_request' && needs.check-should-run.outputs.should-run == 'true'
3434
name: Get changed demos
@@ -73,7 +73,7 @@ jobs:
7373
retention-days: 1
7474

7575
determine-framework-tests-scope:
76-
runs-on: devextreme-shr2
76+
runs-on: ubuntu-latest
7777
name: Determine scope for framework tests
7878
needs: [check-should-run, get-changes]
7979
if: |
@@ -1054,7 +1054,7 @@ jobs:
10541054
if-no-files-found: ignore
10551055

10561056
merge-artifacts:
1057-
runs-on: devextreme-shr2
1057+
runs-on: ubuntu-latest
10581058
needs: [testcafe-jquery, testcafe-frameworks-all, testcafe-frameworks-changed]
10591059
if: always() && (needs.testcafe-jquery.result == 'failure' || needs.testcafe-frameworks-all.result == 'failure' || needs.testcafe-frameworks-changed.result == 'failure')
10601060

@@ -1278,7 +1278,7 @@ jobs:
12781278

12791279
csp-report-summary:
12801280
name: CSP Violations Summary
1281-
runs-on: devextreme-shr2
1281+
runs-on: ubuntu-latest
12821282
needs: [check-should-run, csp-check-jquery, csp-check-frameworks]
12831283
if: always() && needs.check-should-run.outputs.should-run == 'true'
12841284
timeout-minutes: 5

apps/demos/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
"glob": "11.1.0",
140140
"globals": "catalog:",
141141
"gulp": "4.0.2",
142+
"http-server": "14.1.1",
142143
"jest": "29.7.0",
143144
"jest-environment-node": "29.7.0",
144145
"lodash": "4.18.1",
@@ -154,7 +155,7 @@
154155
"stylelint-config-recommended-vue": "1.6.1",
155156
"stylelint-config-standard": "38.0.0",
156157
"systemjs-builder": "0.16.15",
157-
"testcafe": "3.7.4",
158+
"testcafe": "catalog:",
158159
"testcafe-reporter-spec-time": "4.0.0",
159160
"ts-node": "10.9.2",
160161
"vue-eslint-parser": "catalog:",

e2e/testcafe-devextreme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"minimist": "1.2.8",
2020
"mockdate": "3.0.5",
2121
"nconf": "0.12.1",
22-
"testcafe": "3.7.4",
22+
"testcafe": "catalog:",
2323
"testcafe-reporter-spec-time": "4.0.0",
2424
"ts-node": "10.9.2",
2525
"eslint": "catalog:",

e2e/wrappers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"karma-coverage": "2.2.1",
7575
"karma-jasmine": "5.1.0",
7676
"karma-jasmine-html-reporter": "2.1.0",
77-
"testcafe": "3.7.4",
77+
"testcafe": "catalog:",
7878
"typescript": "5.8.3",
7979
"vite": "8.0.16"
8080
},

package.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,17 @@
3535
"@types/jest": "29.5.14",
3636
"@types/node": "20.12.8",
3737
"@types/shelljs": "0.8.15",
38-
"@types/tar-fs": "2.0.4",
39-
"@types/yargs": "17.0.35",
40-
"@vue/shared": "3.4.27",
4138
"axe-core": "catalog:",
42-
"cheerio": "1.2.0",
39+
"@types/yargs": "17.0.35",
4340
"devextreme-internal-tools": "catalog:tools",
4441
"devextreme-metadata": "workspace:*",
45-
"http-server": "14.1.1",
4642
"husky": "8.0.3",
4743
"jest": "29.7.0",
48-
"jspdf-autotable": "3.8.4",
4944
"lint-staged": "14.0.1",
5045
"nx": "22.7.0",
5146
"shelljs": "0.8.5",
52-
"shx": "0.4.0",
53-
"source-map": "0.7.6",
5447
"stylelint": "catalog:",
55-
"tar-fs": "3.1.2",
5648
"ts-node": "10.9.2",
57-
"vue": "3.4.27",
5849
"yargs": "17.7.2"
5950
},
6051
"pre-commit": [

packages/devextreme-angular/karma.conf.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,13 @@ module.exports = function (config) {
7676
singleRun: true,
7777

7878
concurrency: Infinity,
79+
80+
browserNoActivityTimeout: 120000,
81+
82+
browserDisconnectTimeout: 10000,
83+
84+
browserDisconnectTolerance: 2,
85+
86+
captureTimeout: 120000,
7987
});
8088
};

0 commit comments

Comments
 (0)