From 5bc2ca29605aa32ae36eb040a4b08aa1026df5fb Mon Sep 17 00:00:00 2001 From: alexlavrov Date: Mon, 17 Jun 2024 17:43:04 +0400 Subject: [PATCH 1/4] Update branch in workflows --- .github/workflows/codeql.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/packages_publishing_scheduler.yml | 2 +- .github/workflows/paths.yml | 2 +- .github/workflows/playgrounds_tests.yml | 2 +- .github/workflows/qunit_tests-additional-renovation.yml | 2 +- .github/workflows/qunit_tests-renovation.yml | 2 +- .github/workflows/renovation.yml | 2 +- .github/workflows/styles.yml | 2 +- .github/workflows/testcafe_tests.yml | 2 +- .github/workflows/themebuilder_tests.yml | 2 +- .github/workflows/ts_declarations.yml | 2 +- .github/workflows/wrapper_tests.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ca6fff5a9761..f2e078961bf9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - branch: [ '22_1', '22_2', '23_1', '23_2', '24_1' ] + branch: [ '22_1', '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 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ab830ad0ff81..d7f4661f3f8b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }} diff --git a/.github/workflows/packages_publishing_scheduler.yml b/.github/workflows/packages_publishing_scheduler.yml index 5d3695f239ce..656ef6bd8030 100644 --- a/.github/workflows/packages_publishing_scheduler.yml +++ b/.github/workflows/packages_publishing_scheduler.yml @@ -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: diff --git a/.github/workflows/paths.yml b/.github/workflows/paths.yml index 2b9fa1620bfc..a2a0539386fb 100644 --- a/.github/workflows/paths.yml +++ b/.github/workflows/paths.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] env: MAX_LENGTH: 170 diff --git a/.github/workflows/playgrounds_tests.yml b/.github/workflows/playgrounds_tests.yml index 77200ed5dd36..ee06f91b0069 100644 --- a/.github/workflows/playgrounds_tests.yml +++ b/.github/workflows/playgrounds_tests.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }} diff --git a/.github/workflows/qunit_tests-additional-renovation.yml b/.github/workflows/qunit_tests-additional-renovation.yml index 5705f6a1e536..5d69d103a228 100644 --- a/.github/workflows/qunit_tests-additional-renovation.yml +++ b/.github/workflows/qunit_tests-additional-renovation.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }} diff --git a/.github/workflows/qunit_tests-renovation.yml b/.github/workflows/qunit_tests-renovation.yml index aadbca641f50..c9d1e0c98e0b 100644 --- a/.github/workflows/qunit_tests-renovation.yml +++ b/.github/workflows/qunit_tests-renovation.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }} diff --git a/.github/workflows/renovation.yml b/.github/workflows/renovation.yml index 30d77607e93e..be3f1286502e 100644 --- a/.github/workflows/renovation.yml +++ b/.github/workflows/renovation.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }} diff --git a/.github/workflows/styles.yml b/.github/workflows/styles.yml index 960f27314c7a..8de3b42d4f4a 100644 --- a/.github/workflows/styles.yml +++ b/.github/workflows/styles.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }} diff --git a/.github/workflows/testcafe_tests.yml b/.github/workflows/testcafe_tests.yml index 8d7cca54bec4..a03b6906f166 100644 --- a/.github/workflows/testcafe_tests.yml +++ b/.github/workflows/testcafe_tests.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }} diff --git a/.github/workflows/themebuilder_tests.yml b/.github/workflows/themebuilder_tests.yml index 887f31941f26..12fe6e6098e7 100644 --- a/.github/workflows/themebuilder_tests.yml +++ b/.github/workflows/themebuilder_tests.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] env: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_TOKEN }} diff --git a/.github/workflows/ts_declarations.yml b/.github/workflows/ts_declarations.yml index 16112ce748e1..293272236b24 100644 --- a/.github/workflows/ts_declarations.yml +++ b/.github/workflows/ts_declarations.yml @@ -7,7 +7,7 @@ concurrency: on: pull_request: push: - branches: [24_1] + branches: [24_2] jobs: check-ts-bundle: diff --git a/.github/workflows/wrapper_tests.yml b/.github/workflows/wrapper_tests.yml index 02386c6f5c68..64f58d1d3985 100644 --- a/.github/workflows/wrapper_tests.yml +++ b/.github/workflows/wrapper_tests.yml @@ -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 }} From cf463a6f3249c334b402eae5e7aedbe3a79ce310 Mon Sep 17 00:00:00 2001 From: alexlavrov Date: Mon, 17 Jun 2024 17:43:13 +0400 Subject: [PATCH 2/4] Rotate ports --- packages/devextreme/ports.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devextreme/ports.json b/packages/devextreme/ports.json index 1b762e33b264..729287722a58 100644 --- a/packages/devextreme/ports.json +++ b/packages/devextreme/ports.json @@ -1,4 +1,4 @@ { - "qunit": "20030", - "vectormap-utils-tester": "20031" + "qunit": "20040", + "vectormap-utils-tester": "20041" } From 0f0ae8e522c931390bcb122e743aea3902181b58 Mon Sep 17 00:00:00 2001 From: alexlavrov Date: Mon, 17 Jun 2024 17:43:22 +0400 Subject: [PATCH 3/4] Remove badges --- apps/demos/menuMeta.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/demos/menuMeta.json b/apps/demos/menuMeta.json index 2b0e16dd5687..fd9aeff95527 100644 --- a/apps/demos/menuMeta.json +++ b/apps/demos/menuMeta.json @@ -3821,7 +3821,6 @@ "Title": "Scrolling", "Name": "Scrolling", "Widget": "Menu", - "Badge": "New", "DemoType": "Web" } ] @@ -4170,7 +4169,6 @@ "Title": "Overview", "Name": "Overview", "Widget": "Splitter", - "Badge": "New", "DemoType": "Web" } ] @@ -4727,8 +4725,7 @@ { "Title": "Grouped Fields", "Name": "GroupedFields", - "Widget": "Form", - "Badge": "Updated" + "Widget": "Form" }, { "Title": "Columns Adaptability", @@ -5194,7 +5191,6 @@ { "Title": "Overview", "Name": "Overview", - "Badge": "Updated", "DocUrl": "", "Widget": "DropDownButton", "DemoType": "Web", @@ -5224,7 +5220,6 @@ "Title": "Scrolling", "Name": "Scrolling", "Widget": "ContextMenu", - "Badge": "New", "DemoType": "Web" }, { From a099f846d5417370d78fc3d5806cc3954098763f Mon Sep 17 00:00:00 2001 From: alexlavrov Date: Tue, 18 Jun 2024 13:09:03 +0400 Subject: [PATCH 4/4] Disable codeQL on branch 22_1 --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f2e078961bf9..8cee6837275e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - branch: [ '22_1', '22_2', '23_1', '23_2', '24_1', '24_2' ] + 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