From cf682db6a80eefec0cd94605d2d7ae8ee4038c07 Mon Sep 17 00:00:00 2001
From: jev forsberg <jev.forsberg@grafana.com>
Date: Fri, 11 Jul 2025 15:27:29 -0600
Subject: [PATCH] Fix branch triggers: Update workflows to target both main and
 release branches

- CORRECTED: Include both main and release-* branch patterns
- Ensures workflows run on both main branch (original functionality) and release branches (needed for backport)
- Previous commit incorrectly removed main branch support
- Workflows updated: documentation-ci, pr-codeql-analysis-*, pr-dependabot-update-go-workspace, pr-go-workspace-check, pr-k8s-codegen-check, verify-kinds, codeowners-validator
---
 .github/workflows/codeowners-validator.yml              | 2 +-
 .github/workflows/documentation-ci.yml                  | 2 +-
 .github/workflows/pr-codeql-analysis-javascript.yml     | 2 +-
 .github/workflows/pr-codeql-analysis-python.yml         | 2 +-
 .github/workflows/pr-dependabot-update-go-workspace.yml | 2 +-
 .github/workflows/pr-go-workspace-check.yml             | 2 +-
 .github/workflows/pr-k8s-codegen-check.yml              | 2 +-
 .github/workflows/verify-kinds.yml                      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeowners-validator.yml b/.github/workflows/codeowners-validator.yml
index b0119b923ab..7c742712c8b 100644
--- a/.github/workflows/codeowners-validator.yml
+++ b/.github/workflows/codeowners-validator.yml
@@ -2,7 +2,7 @@ name: "Codeowners Validator"
 
 on:
   pull_request:
-    branches: [ release-* ]
+    branches: [ main, release-* ]
 
 permissions: {}
 
diff --git a/.github/workflows/documentation-ci.yml b/.github/workflows/documentation-ci.yml
index 33a54ca82f7..1ec0c6cf0ef 100644
--- a/.github/workflows/documentation-ci.yml
+++ b/.github/workflows/documentation-ci.yml
@@ -1,7 +1,7 @@
 name: Documentation CI
 on:
   pull_request:
-    branches: ["release-*"]
+    branches: ["main", "release-*"]
     paths: ["docs/sources/**"]
   workflow_dispatch:
 
diff --git a/.github/workflows/pr-codeql-analysis-javascript.yml b/.github/workflows/pr-codeql-analysis-javascript.yml
index df329a6c322..c689bdf285e 100644
--- a/.github/workflows/pr-codeql-analysis-javascript.yml
+++ b/.github/workflows/pr-codeql-analysis-javascript.yml
@@ -3,7 +3,7 @@ name: "CodeQL for PR / javascript"
 on:
   workflow_dispatch:
   pull_request:
-    branches: [release-*]
+    branches: [main, release-*]
     paths:
       - '**/*.js'
       - '**/*.ts'
diff --git a/.github/workflows/pr-codeql-analysis-python.yml b/.github/workflows/pr-codeql-analysis-python.yml
index 19b90345fca..71e2c34e386 100644
--- a/.github/workflows/pr-codeql-analysis-python.yml
+++ b/.github/workflows/pr-codeql-analysis-python.yml
@@ -3,7 +3,7 @@ name: "CodeQL for PR / python"
 on:
   workflow_dispatch:
   pull_request:
-    branches: [release-*]
+    branches: [main, release-*]
     paths:
       - '**/*.py'
 
diff --git a/.github/workflows/pr-dependabot-update-go-workspace.yml b/.github/workflows/pr-dependabot-update-go-workspace.yml
index c5e33549eda..25711c6170b 100644
--- a/.github/workflows/pr-dependabot-update-go-workspace.yml
+++ b/.github/workflows/pr-dependabot-update-go-workspace.yml
@@ -1,7 +1,7 @@
 name: "Update Go Workspace for Dependabot PRs"
 on:
   pull_request:
-    branches: [release-*]
+    branches: [main, release-*]
     paths:
       - .github/workflows/pr-dependabot-update-go-workspace.yml
       - go.mod
diff --git a/.github/workflows/pr-go-workspace-check.yml b/.github/workflows/pr-go-workspace-check.yml
index 90979555d2f..0bde21050e3 100644
--- a/.github/workflows/pr-go-workspace-check.yml
+++ b/.github/workflows/pr-go-workspace-check.yml
@@ -3,7 +3,7 @@ name: "Go Workspace Check"
 on:
   workflow_dispatch:
   pull_request:
-    branches: [release-*]
+    branches: [main, release-*]
     paths:
       - .github/workflows/pr-go-workspace-check.yml
       - go.mod
diff --git a/.github/workflows/pr-k8s-codegen-check.yml b/.github/workflows/pr-k8s-codegen-check.yml
index 12f7c580583..96711d371a7 100644
--- a/.github/workflows/pr-k8s-codegen-check.yml
+++ b/.github/workflows/pr-k8s-codegen-check.yml
@@ -3,7 +3,7 @@ name: "K8s Codegen Check"
 on:
   workflow_dispatch:
   pull_request:
-    branches: [release-*]
+    branches: [main, release-*]
     paths:
       - "pkg/apis/**"
       - "pkg/aggregator/apis/**"
diff --git a/.github/workflows/verify-kinds.yml b/.github/workflows/verify-kinds.yml
index b0969c3bafe..e58aa03f3ba 100644
--- a/.github/workflows/verify-kinds.yml
+++ b/.github/workflows/verify-kinds.yml
@@ -2,7 +2,7 @@ name: "verify-kinds"
 
 on:
   pull_request:
-    branches: [ release-* ]
+    branches: [ main, release-* ]
     paths:
       - '**/*.cue'