From 6c9a089c10b86fd6e995d9a852b60be4bc2bed67 Mon Sep 17 00:00:00 2001
From: James Mortemore <jamesmortemore@gmail.com>
Date: Sat, 18 Apr 2026 13:32:12 +0100
Subject: [PATCH] ci: extend Java CI / E2E / CodeQL / Maven publish to
 release/v7

So that pull requests targeting release/v7 are properly gated by the
same checks as master, and pushes to release/v7 (i.e. merged bug fix
PRs and release commits) trigger Maven Central publication for the
7.x line.

publish-maven.yml uses a workflow_run trigger which always reads the
workflow file from the default branch (master), so the branches list
and the gate-job `if:` condition must be updated on master for the
release/v7 branch to be eligible for publication.

The other workflows (build.yml, e2e.yml, codeql.yml) are updated for
symmetry with the same change already landed on release/v7 so that
future cherry-picks between branches don't have to fix the trigger.
---
 .github/workflows/build.yml         | 1 +
 .github/workflows/codeql.yml        | 4 ++--
 .github/workflows/e2e.yml           | 1 +
 .github/workflows/publish-maven.yml | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b51c7d8a5..ebe3e4a01 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+      - release/v7
   schedule:
     - cron: "0 0 * * 0" # weekly
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index b606d835f..8564637ab 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: ["master"]
+    branches: ["master", "release/v7"]
   pull_request:
-    branches: ["master"]
+    branches: ["master", "release/v7"]
   schedule:
     - cron: "0 0 * * 0" # weekly
 
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 1a62824b2..31f954245 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -9,6 +9,7 @@ on:
   push:
     branches:
       - master
+      - release/v7
   workflow_dispatch: # Allow manual triggering
 
 jobs:
diff --git a/.github/workflows/publish-maven.yml b/.github/workflows/publish-maven.yml
index 73d83438a..f3e5c7af1 100644
--- a/.github/workflows/publish-maven.yml
+++ b/.github/workflows/publish-maven.yml
@@ -4,7 +4,7 @@ on:
   workflow_run:
     workflows: ["Java CI", "E2E Tests"]
     types: [completed]
-    branches: [master]
+    branches: [master, release/v7]
 
 permissions:
   contents: read
@@ -18,10 +18,10 @@ concurrency:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    # Only consider successful completions on master from push events
+    # Only consider successful completions on master / release branches from push events
     if: >
       github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.head_branch == 'master' &&
+      (github.event.workflow_run.head_branch == 'master' || github.event.workflow_run.head_branch == 'release/v7') &&
       github.event.workflow_run.event == 'push'
 
     steps: