Update determine-matrix and deploy action to accept multiple branches

Author: ryanjbaxter

.github/actions/determine-matrix/README.md

@@ -24,7 +24,7 @@ This action reads project configuration from `config/projects.json` in the sprin
 | `repository` | Repository name in format `org/repo-name` | Yes | - |
 | `event-name` | GitHub event name (schedule, push, workflow_dispatch, etc.) | Yes | - |
 | `ref-name` | Git ref name (branch name) | Yes | - |
-| `branch` | Optional branch override for single-branch builds | No | `''` |
+| `branches` | Optional branch override (single branch or comma-separated list) for builds | No | `''` |
 | `config-ref` | Git ref for spring-cloud-github-actions config | No | `main` |
 
 ## Outputs
@@ -56,7 +56,7 @@ jobs:
           repository: ${{ github.repository }}
           event-name: ${{ github.event_name }}
           ref-name: ${{ github.ref_name }}
-          branch: ${{ inputs.branch }}
+          branches: ${{ inputs.branches }}
 
   build:
     needs: setup
@@ -86,9 +86,32 @@ Other Spring Cloud repositories can reference this action:
     repository: ${{ github.repository }}
     event-name: ${{ github.event_name }}
     ref-name: ${{ github.ref_name }}
-    branch: ${{ inputs.branch }}
+    branches: ${{ inputs.branches }}
 ```
 
+### Using Comma-Separated Branches
+
+You can specify multiple branches using a comma-separated list. This is useful for manual workflow dispatches or when you want to build specific branches:
+
+```yaml
+- name: Determine build matrix
+  id: determine-matrix
+  uses: spring-cloud/spring-cloud-github-actions/.github/actions/determine-matrix@main
+  with:
+    repository: ${{ github.repository }}
+    event-name: ${{ github.event_name }}
+    ref-name: ${{ github.ref_name }}
+    branches: "main,3.3.x,3.2.x"  # Build multiple branches
+```
+
+**Note**: Comma-separated branch input is ignored for scheduled events, which always use the `branches.scheduled` configuration from `projects.json`.
+
+**Examples**:
+- Single branch: `branches: "main"` → builds only `main`
+- Multiple branches: `branches: "main,3.3.x,3.2.x"` → builds all three branches
+- With whitespace: `branches: "main, 3.3.x , 3.2.x"` → automatically trims whitespace
+- Empty input: `branches: ""` → falls back to `ref-name`
+
 ### Using Additional Outputs
 
 ```yaml
@@ -99,7 +122,7 @@ Other Spring Cloud repositories can reference this action:
     repository: ${{ github.repository }}
     event-name: ${{ github.event_name }}
     ref-name: ${{ github.ref_name }}
-    branch: ${{ inputs.branch }}
+    branches: ${{ inputs.branches }}
 
 - name: Display build info
   run: |
@@ -117,7 +140,7 @@ Other Spring Cloud repositories can reference this action:
     repository: ${{ github.repository }}
     event-name: ${{ github.event_name }}
     ref-name: ${{ github.ref_name }}
-    branch: ${{ inputs.branch }}
+    branches: ${{ inputs.branches }}
     config-ref: 'feature/new-config-structure'  # Use feature branch config
 ```
 
@@ -162,8 +185,11 @@ The action reads configuration from `config/projects.json` in the spring-cloud-g
 1. **Repository Detection**: Extracts repository name and detects commercial vs OSS variant
 2. **Config Loading**: Checks out spring-cloud-github-actions repo and reads `config/projects.json`
 3. **Branch Determination**:
-   - For scheduled runs: builds multiple branches from config
-   - For other events: builds single branch (from input or ref-name)
+   - For scheduled runs: builds multiple branches from config (ignores branch input)
+   - For other events:
+     - If `branch` input is provided and contains commas: parses comma-separated list
+     - If `branch` input is provided (single branch): uses that branch
+     - Otherwise: uses `ref-name` (the triggering branch)
 4. **JDK Mapping**: Maps each branch to its configured JDK versions
 5. **Matrix Generation**: Creates matrix entries for each branch + JDK combination
 6. **Additional Outputs**: Generates branches list and branch-jdk-mapping
@@ -189,8 +215,8 @@ on:
     - cron: '0 2 * * *'
   workflow_dispatch:
     inputs:
-      branch:
-        description: 'Branch to build'
+      branches:
+        description: 'Branch(es) to build - single branch or comma-separated list'
         required: false
 
 jobs:
@@ -210,7 +236,7 @@ jobs:
           repository: ${{ github.repository }}
           event-name: ${{ github.event_name }}
           ref-name: ${{ github.ref_name }}
-          branch: ${{ inputs.branch }}
+          branches: ${{ inputs.branches }}
 
   build:
     name: Build ${{ matrix.branch }} (JDK ${{ matrix.java-version }})

.github/actions/determine-matrix/action.yml

@@ -12,8 +12,8 @@ inputs:
   ref-name:
     description: 'Git ref name (branch name)'
     required: true
-  branch:
-    description: 'Optional branch override for single-branch builds'
+  branches:
+    description: 'Optional branch override (single branch or comma-separated list) for builds'
     required: false
     default: ''
   config-ref:
@@ -50,7 +50,7 @@ runs:
         echo "Event name: ${{ inputs.event-name }}"
         echo "Ref name: ${{ inputs.ref-name }}"
         echo "Repository: ${{ inputs.repository }}"
-        echo "Branch input: ${{ inputs.branch }}"
+        echo "Branch input: ${{ inputs.branches }}"
         echo ""
 
         # Extract repository name (without org)
@@ -92,20 +92,29 @@ runs:
           CONFIG_PATH=".defaults.$CONFIG_SECTION"
         fi
 
-        # Determine the branch to use
-        BRANCH="${{ inputs.branch }}"
-        if [[ -z "$BRANCH" ]]; then
-          BRANCH="${{ inputs.ref-name }}"
-        fi
-        echo "Target branch: $BRANCH"
-
         # Determine which branches to build based on event type
         if [[ "${{ inputs.event-name }}" == "schedule" ]]; then
-          echo "Trigger: Scheduled run - building multiple branches"
+          echo "Trigger: Scheduled run - building multiple branches from config"
           BRANCHES=$(jq -r "$CONFIG_PATH.branches.scheduled // .defaults.$CONFIG_SECTION.branches.scheduled" "$CONFIG_FILE" | jq -r '.[]')
         else
-          echo "Trigger: ${{ inputs.event-name }} - building single branch"
-          BRANCHES="$BRANCH"
+          # Non-scheduled event: check branch input
+          BRANCH_INPUT="${{ inputs.branches }}"
+          if [[ -n "$BRANCH_INPUT" ]]; then
+            # Check if comma-separated
+            if [[ "$BRANCH_INPUT" == *","* ]]; then
+              echo "Trigger: ${{ inputs.event-name }} - building multiple branches from comma-separated input"
+              # Parse comma-separated branches: split, trim whitespace, filter empty
+              BRANCHES=$(echo "$BRANCH_INPUT" | tr ',' '\n' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | grep -v '^$')
+              BRANCH_COUNT=$(echo "$BRANCHES" | wc -l | tr -d ' ')
+              echo "Detected $BRANCH_COUNT branch(es) in comma-separated input: $(echo "$BRANCHES" | tr '\n' ',' | sed 's/,$//')"
+            else
+              echo "Trigger: ${{ inputs.event-name }} - building single branch from input"
+              BRANCHES="$BRANCH_INPUT"
+            fi
+          else
+            echo "Trigger: ${{ inputs.event-name }} - building single branch from ref"
+            BRANCHES="${{ inputs.ref-name }}"
+          fi
         fi
 
         echo ""

.github/workflows/deploy.yml

@@ -3,8 +3,8 @@ name: Spring Cloud Deploy (Reusable)
 on:
   workflow_call:
     inputs:
-      branch:
-        description: 'Which branch should be built (for workflow_dispatch)'
+      branches:
+        description: 'Which branch(es) should be built - single branch or comma-separated list (e.g., "main,3.3.x,3.2.x")'
         required: false
         type: string
       custom_build_command:
@@ -42,7 +42,7 @@ jobs:
           repository: ${{ github.repository }}
           event-name: ${{ github.event_name }}
           ref-name: ${{ github.ref_name }}
-          branch: ${{ inputs.branch }}
+          branches: ${{ inputs.branches }}
 
   build:
     name: Build ${{ matrix.branch }} (JDK ${{ matrix.java-version }})

examples/deploy.yml

@@ -1,6 +1,9 @@
 # Example caller workflow for Spring Cloud projects
 # Copy this file to your project's .github/workflows/deploy.yml
 # and customize the branch names in the 'on.push.branches' section
+#
+# Note: The 'branches' input accepts either a single branch name or a comma-separated
+# list of branches (e.g., "main,3.3.x,3.2.x") for building multiple branches in one run.
 
 name: Deploy
 
@@ -19,8 +22,8 @@ on:
   # Manual trigger with optional branch override
   workflow_dispatch:
     inputs:
-      branch:
-        description: 'Which branch should be built'
+      branches:
+        description: 'Which branch(es) should be built - single branch or comma-separated list (e.g., "main,3.3.x,3.2.x")'
         required: false
         default: ''
         type: string
@@ -29,7 +32,7 @@ jobs:
   deploy:
     uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@main
     with:
-      branch: ${{ inputs.branch }}
+      branches: ${{ inputs.branches }}
       # Optional: Custom build command to override the default Maven deploy command
       # Supports both single-line and multi-line commands
       # Single-line example: