From 67ed478197320df667127acb1b0384d81f0d9ce9 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Tue, 17 Mar 2026 21:28:06 +0530 Subject: [PATCH 01/13] for-testing: updates forontend CI to allow manual trigger --- .github/workflows/frontend_unit_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/frontend_unit_tests.yml b/.github/workflows/frontend_unit_tests.yml index b57540b09f2e8..09d41ccf9b41a 100644 --- a/.github/workflows/frontend_unit_tests.yml +++ b/.github/workflows/frontend_unit_tests.yml @@ -18,6 +18,7 @@ on: - synchronize - reopened - closed + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.event_name }}-${{ From 2747b183e73a4d35b0241e6bfb98e90483b372a4 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Tue, 17 Mar 2026 21:37:23 +0530 Subject: [PATCH 02/13] for-testing: removed concurrency group in frontend tests to do stress test. --- .github/workflows/frontend_unit_tests.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/frontend_unit_tests.yml b/.github/workflows/frontend_unit_tests.yml index 09d41ccf9b41a..59bdf90eb0288 100644 --- a/.github/workflows/frontend_unit_tests.yml +++ b/.github/workflows/frontend_unit_tests.yml @@ -20,11 +20,6 @@ on: - closed workflow_dispatch: -concurrency: - group: ${{ github.workflow }}-${{ github.event_name }}-${{ - github.event.pull_request.number || github.event.merge_group.head_ref - || github.ref || github.run_id }} - cancel-in-progress: true jobs: generate-job-strategy-matrix: name: Generate job strategy matrix From bb6171384b19d52a9c5125cbb2c609e3e21adbd2 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:24 +0530 Subject: [PATCH 03/13] Add conflict_test.txt --- conflict_test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflict_test.txt diff --git a/conflict_test.txt b/conflict_test.txt new file mode 100644 index 0000000000000..bb76875ffcda2 --- /dev/null +++ b/conflict_test.txt @@ -0,0 +1 @@ +Initial Content From d7ac75be6a8940bb0db8a909bfc4f82d37088c2a Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:37 +0530 Subject: [PATCH 04/13] Conflict change from develop 1 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index bb76875ffcda2..1d67c2fab8539 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Initial Content +Develop change 1 From e54964cf89b66344898de1eafa89d7004410cff7 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:38 +0530 Subject: [PATCH 05/13] Conflict change from develop 2 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index 1d67c2fab8539..c23d4c2fcdc87 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 1 +Develop change 2 From 0776955f68f3d5302859b0e21a5d59d5d16b02a1 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:39 +0530 Subject: [PATCH 06/13] Conflict change from branch 3 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index c23d4c2fcdc87..da000525ae416 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 2 +Branch 3 change From 19ad9fe6e55b44078f80ec4088aab1c19be374c7 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:24 +0530 Subject: [PATCH 07/13] Add conflict_test.txt --- conflict_test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflict_test.txt diff --git a/conflict_test.txt b/conflict_test.txt new file mode 100644 index 0000000000000..bb76875ffcda2 --- /dev/null +++ b/conflict_test.txt @@ -0,0 +1 @@ +Initial Content From e91fa21e14d818554acf154f6cbc8bee5f43cdab Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:37 +0530 Subject: [PATCH 08/13] Conflict change from develop 1 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index bb76875ffcda2..1d67c2fab8539 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Initial Content +Develop change 1 From 11c3afe0843e441ea0fd6f884cd388750ea1cd03 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:38 +0530 Subject: [PATCH 09/13] Conflict change from develop 2 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index 1d67c2fab8539..c23d4c2fcdc87 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 1 +Develop change 2 From 24b9cb2781e4a36136f4ecc9849a5a7b1c191673 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:39 +0530 Subject: [PATCH 10/13] Conflict change from develop 3 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index c23d4c2fcdc87..af077e66c5a49 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 2 +Develop change 3 From fd22b49227d6112be5b360f1326c1b725ff08cd6 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:40 +0530 Subject: [PATCH 11/13] Conflict change from develop 4 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index af077e66c5a49..a572143909f16 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 3 +Develop change 4 From 67db9104aafdfdc551fe93f8ddedbe93e92a711b Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:41 +0530 Subject: [PATCH 12/13] Conflict change from develop 5 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index a572143909f16..2f7d99e0a8a14 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 4 +Develop change 5 From 4f6031ce4c09e77d01b558e25570c5a6f97dd0c3 Mon Sep 17 00:00:00 2001 From: Jayam Patel Date: Mon, 27 Apr 2026 13:06:43 +0530 Subject: [PATCH 13/13] Conflict change from develop 6 --- conflict_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict_test.txt b/conflict_test.txt index 2f7d99e0a8a14..577cee09bd3f4 100644 --- a/conflict_test.txt +++ b/conflict_test.txt @@ -1 +1 @@ -Develop change 5 +Develop change 6