From 449352d6a35bedada85b3cdd331c86d92a55f45b Mon Sep 17 00:00:00 2001
From: Richard Drake <rdrake@rdrake.org>
Date: Wed, 25 Mar 2026 14:52:56 -0400
Subject: [PATCH 1/2] Add per-branch Docker image builds, make Gradle build
 manual-only

Map each branch to a distinct GHCR image name:
- daniel-koala -> code-tracking-qa
- adam -> code-tracking-emote
- bisha -> code-tracking-ai

Change Gradle build workflow to manual trigger only (workflow_dispatch).
---
 .github/workflows/build.yml        |  2 +-
 .github/workflows/docker-image.yml | 28 +++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 34e5b1c..fe86d7c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
 name: Gradle Build
 
-on: [push, pull_request]
+on: [workflow_dispatch]
 
 jobs:
   build:
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 2295516..aef78ed 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -2,13 +2,12 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "daniel-koala" ]
+    branches: [ "daniel-koala", "adam", "bisha" ]
   pull_request:
-    branches: [ "daniel-koala" ]
+    branches: [ "daniel-koala", "adam", "bisha" ]
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   build:
@@ -21,6 +20,25 @@ jobs:
     steps:
     - uses: actions/checkout@v5
 
+    - name: Set image name from branch
+      id: image-name
+      run: |
+        declare -A BRANCH_MAP
+        BRANCH_MAP[daniel-koala]="code-tracking-qa"
+        BRANCH_MAP[adam]="code-tracking-emote"
+        BRANCH_MAP[bisha]="code-tracking-ai"
+
+        BRANCH="${GITHUB_REF_NAME}"
+        IMAGE_NAME="${BRANCH_MAP[$BRANCH]}"
+
+        if [ -z "$IMAGE_NAME" ]; then
+          echo "No image mapping for branch: $BRANCH"
+          exit 1
+        fi
+
+        REPO_OWNER="${{ github.repository_owner }}"
+        echo "image_name=${REPO_OWNER,,}/${IMAGE_NAME}" >> "$GITHUB_OUTPUT"
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
@@ -35,12 +53,12 @@ jobs:
       id: meta
       uses: docker/metadata-action@v5
       with:
-        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        images: ${{ env.REGISTRY }}/${{ steps.image-name.outputs.image_name }}
         tags: |
           type=sha
           type=ref,event=branch
           type=ref,event=pr
-          type=raw,value=latest,enable=${{ github.ref == 'refs/heads/daniel-koala' }}
+          type=raw,value=latest
 
     - name: Build and push Docker image
       uses: docker/build-push-action@v6

From 612d13dbd41478c9e745ca54059cc14e6c490258 Mon Sep 17 00:00:00 2001
From: Richard Drake <rdrake@rdrake.org>
Date: Wed, 25 Mar 2026 15:02:08 -0400
Subject: [PATCH 2/2] Fix branch detection for pull request events

GITHUB_REF_NAME is the PR merge ref (e.g. 1/merge) on pull_request
events. Use GITHUB_HEAD_REF instead, falling back to GITHUB_REF_NAME
for push events.
---
 .github/workflows/docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index aef78ed..d34561f 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -28,7 +28,7 @@ jobs:
         BRANCH_MAP[adam]="code-tracking-emote"
         BRANCH_MAP[bisha]="code-tracking-ai"
 
-        BRANCH="${GITHUB_REF_NAME}"
+        BRANCH="${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}"
         IMAGE_NAME="${BRANCH_MAP[$BRANCH]}"
 
         if [ -z "$IMAGE_NAME" ]; then