Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Branch 24_2 #27607

Merged
merged 4 commits into from
Jun 18, 2024
Merged

CI: Branch 24_2 #27607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bc2ca2
Update branch in workflows
alexslavr Jun 17, 2024
cf463a6
Rotate ports
alexslavr Jun 17, 2024
0f0ae8e
Remove badges
alexslavr Jun 17, 2024
a099f84
Disable codeQL on branch 22_1
alexslavr Jun 18, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: [ '22_1', '22_2', '23_1', '23_2', '24_1' ]
branch: [ '22_2', '23_1', '23_2', '24_1', '24_2' ]
language: [ 'csharp', 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]
pomahtri marked this conversation as resolved.
Show resolved Hide resolved

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packages_publishing_scheduler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
strategy:
matrix:
branch: ['23_2', '24_1']
branch: ['23_2', '24_1', '24_2']

name: Run Packages Publishing workflow
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/paths.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

env:
MAX_LENGTH: 170
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playgrounds_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qunit_tests-additional-renovation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qunit_tests-renovation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renovation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/styles.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testcafe_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/themebuilder_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ts_declarations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

jobs:
check-ts-bundle:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wrapper_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: DevExtreme Wrappers Tests
on:
pull_request:
push:
branches: [24_1]
branches: [24_2]

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }}
Expand Down
7 changes: 1 addition & 6 deletions apps/demos/menuMeta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3821,7 +3821,6 @@
"Title": "Scrolling",
"Name": "Scrolling",
"Widget": "Menu",
"Badge": "New",
"DemoType": "Web"
}
]
Expand Down Expand Up @@ -4170,7 +4169,6 @@
"Title": "Overview",
"Name": "Overview",
"Widget": "Splitter",
"Badge": "New",
"DemoType": "Web"
}
]
Expand Down Expand Up @@ -4727,8 +4725,7 @@
{
"Title": "Grouped Fields",
"Name": "GroupedFields",
"Widget": "Form",
"Badge": "Updated"
"Widget": "Form"
},
{
"Title": "Columns Adaptability",
Expand Down Expand Up @@ -5194,7 +5191,6 @@
{
"Title": "Overview",
"Name": "Overview",
"Badge": "Updated",
"DocUrl": "",
"Widget": "DropDownButton",
"DemoType": "Web",
Expand Down Expand Up @@ -5224,7 +5220,6 @@
"Title": "Scrolling",
"Name": "Scrolling",
"Widget": "ContextMenu",
"Badge": "New",
"DemoType": "Web"
},
{
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/ports.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"qunit": "20030",
"vectormap-utils-tester": "20031"
"qunit": "20040",
"vectormap-utils-tester": "20041"
}
Loading