improvement: add branch parameter (#2385)

* add branch parameter

* branch name validation

---------

Co-authored-by: AR Abdul Azeez <abdul@onesignal.com>

Author: abdulraqeeb33

.github/workflows/create-release-pr.yml

@@ -1,12 +1,21 @@
 name: Create Release PR
 
+# Note: The "Use workflow from" dropdown selects which version of THIS workflow to run.
+# Always select "main" unless you're testing workflow changes from another branch.
+# The "base_branch" input below determines where the release PR will be targeted.
+
 on:
   workflow_dispatch:
     inputs:
       version:
         description: 'New SDK version (e.g. 5.1.38 or 5.2.0-beta1)'
         type: string
         required: true
+      base_branch:
+        description: 'Target branch for the PR (e.g. main for regular releases, 5.4-main for 5.4.x releases)'
+        type: string
+        required: false
+        default: 'main'
 
 permissions:
   contents: write
@@ -18,25 +27,58 @@ jobs:
 
     env:
       VERSION: ${{ github.event.inputs.version }}
+      BASE_BRANCH: ${{ github.event.inputs.base_branch || 'main' }}
       BRANCH: rel/${{ github.event.inputs.version }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
+      - name: 📋 Display Configuration
+        run: |
+          echo "============================================"
+          echo "📦 Release Version: $VERSION"
+          echo "🎯 Base Branch (PR Target): $BASE_BRANCH"
+          echo "🌿 Release Branch (to create): $BRANCH"
+          echo "============================================"
+
+      - name: ✅ Validate Base Branch
+        run: |
+          if [[ "$BASE_BRANCH" == "main" ]]; then
+            echo "✅ Valid base branch: main"
+          elif [[ "$BASE_BRANCH" =~ ^[0-9]+\.[0-9]+-main$ ]]; then
+            echo "✅ Valid base branch: $BASE_BRANCH"
+          else
+            echo "❌ ERROR: Invalid base branch '$BASE_BRANCH'"
+            echo ""
+            echo "Base branch must be either:"
+            echo "  - 'main' (for regular releases)"
+            echo "  - 'X.Y-main' (for version-specific releases, e.g., 5.4-main, 5.5-main)"
+            echo ""
+            echo "Examples:"
+            echo "  ✅ main"
+            echo "  ✅ 5.4-main"
+            echo "  ✅ 5.10-main"
+            echo "  ❌ master"
+            echo "  ❌ 5.4"
+            echo "  ❌ 5.4-develop"
+            exit 1
+          fi
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
             fetch-depth: 0 # Ensure full history for git log
             fetch-tags: true
 
-      - name: Create release branch from main
+      - name: Create release branch from base
         run: |
           
           if git ls-remote --exit-code --heads origin "$BRANCH"; then
             echo "Deleting remote branch $BRANCH"
             git push origin --delete "$BRANCH"
           fi
 
-          git checkout -b "$BRANCH" origin/main
+          echo "Creating release branch $BRANCH from $BASE_BRANCH"
+          git checkout -b "$BRANCH" origin/$BASE_BRANCH
 
       - name: Update SDK_VERSION in gradle.properties
         run: |
@@ -141,4 +183,4 @@ jobs:
             --title "Release SDK v$VERSION" \
             --body-file pr_body.md \
             --head "$BRANCH" \
-            --base main
+            --base "$BASE_BRANCH"

.github/workflows/publish-release.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - '*-main'  # Matches 5.4-main, 5.5-main, etc.
   workflow_dispatch:
     inputs:
       ref:
@@ -19,7 +20,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
 
-    # Auto-run only if this is a rel/* merge commit into main, OR manual dispatch
+    # Auto-run only if this is a rel/* merge commit, OR manual dispatch
     if: github.event_name == 'workflow_dispatch' ||
       (startsWith(github.event.head_commit.message, 'Merge pull request') &&
       contains(github.event.head_commit.message, 'rel/'))
@@ -39,6 +40,17 @@ jobs:
         with:
           ref: ${{ github.event.inputs.ref || github.sha }}
 
+      - name: Detect current branch
+        id: detect_branch
+        run: |
+          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            BRANCH="${{ github.event.inputs.ref }}"
+          else
+            BRANCH="${{ github.ref_name }}"
+          fi
+          echo "CURRENT_BRANCH=$BRANCH" >> $GITHUB_ENV
+          echo "Publishing from branch: $BRANCH"
+
       - name: Ensure Java 11 or 17
         run: |
           CURRENT_JAVA=$(java -version 2>&1 | head -n 1 | awk -F '"' '{print $2}')
@@ -92,17 +104,19 @@ jobs:
             -Psigning.password="$SDK_SIGNING_PASSWORD" \
             -Psigning.secretKeyRingFile="$GPG_FILE_PATH"
 
-      - name: Get latest merged rel/* PR into main
+      - name: Get latest merged rel/* PR
         id: fetch_pr
         run: |
+          echo "Looking for merged release PRs into base branch: $CURRENT_BRANCH"
+          
           PR_JSON=$(gh pr list \
             --state merged \
-            --base main \
+            --base "$CURRENT_BRANCH" \
             --json number,title,body,headRefName,mergedAt \
             --jq '[.[] | select(.headRefName | startswith("rel/"))] | sort_by(.mergedAt) | last')
 
           if [[ -z "$PR_JSON" || "$PR_JSON" == "null" ]]; then
-            echo "❌ No merged release PR found."
+            echo "❌ No merged release PR found for base branch: $CURRENT_BRANCH"
             exit 1
           fi