Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/actions/run-qunit-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,6 @@ runs:
shell: bash
run: pnpm install --frozen-lockfile

- name: Build dotnet
working-directory: ./packages/devextreme
shell: bash
run: dotnet build build/build-dotnet.sln

- name: Run QUnit tests
working-directory: ./packages/devextreme
shell: bash
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/qunit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ jobs:
shell: bash
env:
DEVEXTREME_TEST_CI: "true"
DOTNET_CLI_TELEMETRY_OPTOUT: "true"
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
run: pnpx nx build:systemjs

- name: Zip artifacts
Expand Down
24 changes: 0 additions & 24 deletions packages/devextreme/build/build-dotnet.sln

This file was deleted.

8 changes: 4 additions & 4 deletions packages/devextreme/docker-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# 1. GITHUBACTION=true (GitHub Actions)
# - Runs NATIVELY on GitHub runner (NO Docker container!)
# - Uses pre-installed Chrome and dotnet
# - Uses pre-installed Chrome and Node.js
# - Dependencies already installed by workflow
# - Fastest and most stable mode
#
Expand Down Expand Up @@ -79,8 +79,8 @@ function run_test_impl {
pnpm run build
fi

echo "Starting ASP.NET Core test runner..."
dotnet ./testing/runner/bin/runner.dll --single-run & runner_pid=$!
echo "Starting Node.js test runner..."
node ./testing/runner/index.js --single-run & runner_pid=$!
echo "Runner PID: $runner_pid"

local max_attempts=30
Expand Down Expand Up @@ -241,7 +241,7 @@ function start_runner_watchdog {
echo "Watchdog running in background (PID: $watchdog_pid)"
}

echo "node $(node -v), pnpm $(pnpm -v), dotnet $(dotnet --version)"
echo "node $(node -v), pnpm $(pnpm -v)"

TARGET_FUNC="run_$TARGET"

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
"build:testing-playground": "gulp build-renovation-testing:watch --playgroundName",
"build:community-localization": "gulp generate-community-locales",
"build:systemjs": "gulp transpile-systemjs",
"dev": "dotnet build build/build-dotnet.sln && cross-env DEVEXTREME_TEST_CI=true gulp dev",
"dev": "cross-env DEVEXTREME_TEST_CI=true gulp dev",
"dev:watch": "cross-env DEVEXTREME_TEST_CI=true gulp dev-watch",
"transpile-tests": "gulp transpile-tests",
"update-ts-reexports": "dx-tools generate-reexports --sources ./js --exclude \"((dialog|export|list_light|notify|overlay|palette|set_template_engine|splitter_control|themes|themes_callback|track_bar|utils|validation_engine|validation_message)[.d.ts])\" --compiler-options \"{ \\\"typeRoots\\\": [] }\"",
Expand Down
6 changes: 0 additions & 6 deletions packages/devextreme/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -792,12 +792,6 @@
{
"env": "DEVEXTREME_TEST_CI"
},
{
"env": "DOTNET_CLI_TELEMETRY_OPTOUT"
},
{
"env": "DOTNET_SKIP_FIRST_TIME_EXPERIENCE"
},
"default",
"test"
],
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/testing/launch
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ execRunner();

function execRunner () {
spawn(
'dotnet',
[ join(__dirname, 'runner/bin/runner.dll') ],
'node',
[ join(__dirname, 'runner/index.js') ],
{ stdio: 'inherit', shell: true }
);

Expand Down
14 changes: 0 additions & 14 deletions packages/devextreme/testing/runner/.vscode/launch.json

This file was deleted.

13 changes: 0 additions & 13 deletions packages/devextreme/testing/runner/.vscode/tasks.json

This file was deleted.

Loading
Loading