From 6fa453d62fc05195fb00cfdae6208c8072603e80 Mon Sep 17 00:00:00 2001
From: Shreyas-Microsoft <v-swaikar@microsoft.com>
Date: Tue, 26 May 2026 20:11:26 +0530
Subject: [PATCH 1/2] ci: align workflow push/pull_request triggers with shared
 structure

Aligns the on: blocks across CI/CD workflows to match the structure used
by the Multi-Agent Custom Automation Engine Solution Accelerator
docker-build-and-push.yml reference workflow:

  on:
    push:
      branches: [main, dev, demo, hotfix]
      paths: [...]
    pull_request:
      types: [opened, ready_for_review, reopened, synchronize]
      branches: [main, dev, demo, hotfix]
      paths: [...]

Workflows updated:
- ci.yml: PR branches widened from [dev] to [main, dev, demo, hotfix];
  push branches extended with hotfix; PR types added.
- deploy-v2.yml: PR branches widened from [dev] to [main, dev, demo,
  hotfix]; push branches extended with hotfix; PR types added.
- test.yml: push and PR branches extended with demo and hotfix.
- pylint.yml: branches filter added to push (was running on every push);
  full pull_request block added so linting also runs on PRs.
- validate-bicep-params.yml: PR branches extended with demo and hotfix;
  PR types added.

docker-build-and-push.yml already followed the pattern and was left
untouched. Workflows that intentionally use only pull_request_target,
schedule, or workflow_dispatch (pr-title-checker, stale-bot,
broken-links-checker, etc.) were left untouched.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/ci.yml                    |  9 +++++++++
 .github/workflows/deploy-v2.yml             |  9 +++++++++
 .github/workflows/pylint.yml                | 22 +++++++++++++++++++++
 .github/workflows/test.yml                  |  4 ++++
 .github/workflows/validate-bicep-params.yml |  7 +++++++
 5 files changed, 51 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c286b5bb..47dcf010 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ on:
       - main
       - dev
       - demo
+      - hotfix
     paths:
       - 'infra/**'
       - 'azure.yaml'
@@ -18,8 +19,16 @@ on:
       - 'scripts/**'
       - '.github/workflows/ci.yml'
   pull_request:
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
     branches:
+      - main
       - dev
+      - demo
+      - hotfix
     paths:
       - 'infra/**'
       - 'azure.yaml'
diff --git a/.github/workflows/deploy-v2.yml b/.github/workflows/deploy-v2.yml
index 7df8ac60..396ccf25 100644
--- a/.github/workflows/deploy-v2.yml
+++ b/.github/workflows/deploy-v2.yml
@@ -11,6 +11,7 @@ on:
       - main
       - dev
       - demo
+      - hotfix
     paths:
       - 'src/**'
       - 'infra/**'
@@ -20,8 +21,16 @@ on:
       - '.github/workflows/deploy-orchestrator.yml'
       - '.github/workflows/job-*.yml'
   pull_request:
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
     branches:
+      - main
       - dev
+      - demo
+      - hotfix
     paths:
       - 'src/**'
       - 'infra/**'
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
index 7dbe2a63..cc8832cc 100644
--- a/.github/workflows/pylint.yml
+++ b/.github/workflows/pylint.yml
@@ -6,6 +6,28 @@ permissions:
 
 on:
   push:
+    branches:
+      - main
+      - dev
+      - demo
+      - hotfix
+    paths:
+      - '**.py'
+      - '**/pyproject.toml'
+      - '**/requirements.txt'
+      - '.flake8'
+      - '.github/workflows/pylint.yml'
+  pull_request:
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
+    branches:
+      - main
+      - dev
+      - demo
+      - hotfix
     paths:
       - '**.py'
       - '**/pyproject.toml'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 998b0447..d260b5b4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,6 +5,8 @@ on:
     branches:
       - main
       - dev
+      - demo
+      - hotfix
     paths:
       - 'src/backend-api/**/*.py'
       - 'src/backend-api/pyproject.toml'
@@ -23,6 +25,8 @@ on:
     branches:
       - main
       - dev
+      - demo
+      - hotfix
     paths:
       - 'src/backend-api/**/*.py'
       - 'src/backend-api/pyproject.toml'
diff --git a/.github/workflows/validate-bicep-params.yml b/.github/workflows/validate-bicep-params.yml
index d51e478a..1eb12821 100644
--- a/.github/workflows/validate-bicep-params.yml
+++ b/.github/workflows/validate-bicep-params.yml
@@ -7,9 +7,16 @@ on:
   schedule:
     - cron: '30 6 * * 3' # Wednesday 12:00 PM IST (6:30 AM UTC)
   pull_request:
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
     branches:
       - main
       - dev
+      - demo
+      - hotfix
     paths:
       - 'infra/**/*.bicep'
       - 'infra/**/*.parameters.json'

From 79ae89c69949e83aa4575beb1401119cefd201df Mon Sep 17 00:00:00 2001
From: Shreyas-Microsoft <v-swaikar@microsoft.com>
Date: Tue, 26 May 2026 20:32:21 +0530
Subject: [PATCH 2/2] revert pylint

---
 .github/workflows/pylint.yml | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
index cc8832cc..3e0887cb 100644
--- a/.github/workflows/pylint.yml
+++ b/.github/workflows/pylint.yml
@@ -6,28 +6,6 @@ permissions:
 
 on:
   push:
-    branches:
-      - main
-      - dev
-      - demo
-      - hotfix
-    paths:
-      - '**.py'
-      - '**/pyproject.toml'
-      - '**/requirements.txt'
-      - '.flake8'
-      - '.github/workflows/pylint.yml'
-  pull_request:
-    types:
-      - opened
-      - ready_for_review
-      - reopened
-      - synchronize
-    branches:
-      - main
-      - dev
-      - demo
-      - hotfix
     paths:
       - '**.py'
       - '**/pyproject.toml'
@@ -65,4 +43,4 @@ jobs:
       - name: Pylint
         run: |
           echo "Running Pylint..."
-          python -m flake8 --config=.flake8 --verbose .
\ No newline at end of file
+          python -m flake8 --config=.flake8 --verbose .