Skip to content

Commit 992bff7

Browse files
authored
Merge branch '25_2' into 25_2_1724-demos-update-odataremote-filtering-to-be-secure-treeview-virtual-scrolling
2 parents a5499fc + 19f35e8 commit 992bff7

File tree

683 files changed

+60336
-95285
lines changed

Some content is hidden

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

683 files changed

+60336
-95285
lines changed

.github/actions/setup-chrome-headless-shell/action.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ runs:
1717
env:
1818
CHROME_VERSION: ${{ inputs.chrome-version }}
1919
run: |
20-
if [ -n "$CHROME_VERSION" ]; then
21-
sudo apt-get update
22-
sudo apt-get -y install libu2f-udev
23-
sudo apt-get -y install dbus
24-
20+
if [ -n "$CHROME_VERSION" ]; then
2521
echo "version to install: $CHROME_VERSION"
2622
CHROME_BIN=`npx @puppeteer/browsers install chrome-headless-shell@$CHROME_VERSION | awk '{print $2}'`
2723
chmod +x $CHROME_BIN

.github/actions/setup-chrome/action.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ inputs:
99
chrome-version:
1010
description: Chrome version to install
1111
default: "latest"
12+
runner-type:
13+
description: Runner type, 'github-hosted' of 'self-hosted'
14+
default: "self-hosted"
1215

1316
runs:
1417
using: composite
@@ -27,10 +30,14 @@ runs:
2730
shell: bash
2831
env:
2932
CHROME_VERSION: ${{ inputs.chrome-version }}
33+
RUNNER_TYPE: ${{ inputs.runner-type }}
3034
run: |
31-
if [ -n "$CHROME_VERSION" ]; then
32-
sudo apt-get update
33-
sudo apt-get -y install libu2f-udev
35+
CURRENT_CHROME_VERSION=$(google-chrome-stable --product-version)
36+
if [[ -n "$CHROME_VERSION" && "$CURRENT_CHROME_VERSION" != "CHROME_VERSION" ]]; then
37+
if [ "$RUNNER_TYPE" = "github_hosted" ]; then
38+
sudo apt-get update
39+
sudo apt-get -y install libu2f-udev
40+
fi
3441
curl -L "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}-1_amd64.deb" > /tmp/chrome.deb
3542
sudo dpkg -i /tmp/chrome.deb
3643
unlink /tmp/chrome.deb

.github/renovate.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@
159159
"customManagers": [
160160
{
161161
"customType": "regex",
162-
"fileMatch": [
163-
"^\\.github\\/.+\\.ya?ml$"
162+
"managerFilePatterns": [
163+
"/^\\.github\\/.+\\.ya?ml$/"
164164
],
165165
"matchStrings": [
166166
"node-version:\\s*['\"]?(?<currentValue>\\d+([\\.-]\\d+)*)['\"]?(\\s|$)"
@@ -171,8 +171,8 @@
171171
},
172172
{
173173
"customType": "regex",
174-
"fileMatch": [
175-
"^\\.github\\/.+\\.ya?ml$"
174+
"managerFilePatterns": [
175+
"/^\\.github\\/.+\\.ya?ml$/"
176176
],
177177
"matchStrings": [
178178
"chrome-version:\\s*['\"]?(?<currentValue>\\d+(\\.\\d+)+)(-1)?['\"]?(\\s|$)"
@@ -183,8 +183,8 @@
183183
},
184184
{
185185
"customType": "regex",
186-
"fileMatch": [
187-
"^\\.github\\/.+\\.ya?ml$"
186+
"managerFilePatterns": [
187+
"/^\\.github\\/.+\\.ya?ml$/"
188188
],
189189
"matchStrings": [
190190
"firefox-version:\\s*['\"]?(?<currentValue>\\d+(\\.\\d+)+)['\"]?(\\s|$)"

.github/workflows/default_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Run targets
5656
run: >
5757
pnpx nx run-many
58-
-t test
58+
-t lint,test
5959
--exclude
6060
devextreme
6161
devextreme-themebuilder

.github/workflows/demos_visual_tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
uses: ./.github/actions/setup-chrome
8484
with:
8585
chrome-version: '133.0.6943.53'
86+
runner-type: 'github-hosted'
8687

8788
- name: Use Node.js
8889
uses: actions/setup-node@v4

.github/workflows/demos_visual_tests_frameworks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ jobs:
402402
uses: ./.github/actions/setup-chrome
403403
with:
404404
chrome-version: '133.0.6943.53'
405+
runner-type: 'github-hosted'
405406

406407
- name: Use Node.js
407408
uses: actions/setup-node@v4

.github/workflows/lint.yml

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -154,44 +154,6 @@ jobs:
154154
working-directory: ./packages/devextreme
155155
run: pnpx nx lint-texts
156156

157-
CSS:
158-
runs-on: devextreme-shr2
159-
timeout-minutes: 60
160-
steps:
161-
- name: Get sources
162-
uses: actions/checkout@v4
163-
164-
- name: Use Node.js
165-
uses: actions/setup-node@v4
166-
with:
167-
node-version: '20'
168-
169-
- uses: pnpm/action-setup@v4
170-
with:
171-
run_install: false
172-
173-
- name: Get pnpm store directory
174-
shell: bash
175-
run: |
176-
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
177-
178-
- uses: actions/cache@v4
179-
name: Setup pnpm cache
180-
with:
181-
path: |
182-
${{ env.STORE_PATH }}
183-
.nx/cache
184-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
185-
restore-keys: |
186-
${{ runner.os }}-pnpm-store
187-
188-
- name: Install dependencies
189-
run: pnpm install --frozen-lockfile
190-
191-
- name: Lint CSS
192-
working-directory: ./packages/devextreme-scss
193-
run: pnpx nx lint
194-
195157
component_exports:
196158
runs-on: devextreme-shr2
197159
timeout-minutes: 10
@@ -281,7 +243,7 @@ jobs:
281243
notify:
282244
runs-on: devextreme-shr2
283245
name: Send notifications
284-
needs: [TS, JS, CSS, texts, component_exports]
246+
needs: [TS, JS, texts, component_exports]
285247
if: github.event_name != 'pull_request' && contains(needs.*.result, 'failure')
286248

287249
steps:

.github/workflows/qunit_tests-renovation.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ jobs:
6060
DOTNET_CLI_TELEMETRY_OPTOUT: "true"
6161
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
6262
BUILD_INPROGRESS_RENOVATION: "true"
63-
run: |
64-
node ../../tools/scripts/performance_log.js &
65-
pnpx nx build:dev
63+
run: pnpx nx build:dev
6664

6765
- name: Zip artifacts
6866
working-directory: ./packages/devextreme

.github/workflows/testcafe_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ jobs:
231231
[ "${{ matrix.ARGS.platform }}" != "" ] && PLATFORM="--platform ${{ matrix.ARGS.platform }}"
232232
all_args="--browsers=chrome:devextreme-shr2 --componentFolder ${{ matrix.ARGS.componentFolder }} $CONCURRENCY $INDICES $PLATFORM $THEME"
233233
echo "$all_args"
234-
node ../../tools/scripts/performance_log.js &
235234
pnpm run test $all_args
236235
237236
- name: Sanitize job name

.github/workflows/wrapper_tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,17 @@ jobs:
110110
fi
111111
112112
test:
113-
runs-on: devextreme-shr2
114113
timeout-minutes: 20
115114
needs: build
116115
strategy:
117116
fail-fast: false
118117
matrix:
119-
framework: [angular, react, vue]
118+
framework: [react, vue]
119+
runner: [devextreme-shr2]
120+
include:
121+
- runner: ubuntu-22.04
122+
framework: angular
123+
runs-on: ${{ matrix.runner }}
120124

121125
steps:
122126
- name: Get sources

0 commit comments

Comments
 (0)