Fix merge workflow for non-main branch pushes

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: bladata1990 <balakrishnan.r@atlan.com>

Author: bladata1990

.github/workflows/custom-package-container.yml

@@ -49,7 +49,7 @@ jobs:
         id: tags
         run: |
           if [ -n "${{ inputs.branch }}" ]; then
-            # For manual runs with branch specified, use version and branch name (sanitized)
+            # For non-main branches, use version and branch name (sanitized)
             BRANCH_NAME=$(echo "${{ inputs.branch }}" | sed 's/[^a-zA-Z0-9._-]/-/g')
             echo "tags=ghcr.io/atlanhq/csa-${{inputs.package_name}}:${{inputs.version}}-${BRANCH_NAME}" >> $GITHUB_OUTPUT
             echo "build_version=${{inputs.version}}-${BRANCH_NAME}" >> $GITHUB_OUTPUT

.github/workflows/merge.yml

@@ -234,9 +234,9 @@ jobs:
             # For main branch pushes, use version and latest
             echo "tags=ghcr.io/atlanhq/atlan-java:${{ needs.merge-build.outputs.version }},ghcr.io/atlanhq/atlan-java:latest" >> $GITHUB_OUTPUT
           else
-            # For non-main branch pushes, use version-SNAPSHOT-branch name
+            # For non-main branch pushes, use version and branch name
             BRANCH_NAME=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/-/g')
-            echo "tags=ghcr.io/atlanhq/atlan-java:${{ needs.merge-build.outputs.version }}-SNAPSHOT-${BRANCH_NAME}" >> $GITHUB_OUTPUT
+            echo "tags=ghcr.io/atlanhq/atlan-java:${{ needs.merge-build.outputs.version }}-${BRANCH_NAME}" >> $GITHUB_OUTPUT
           fi
       - name: Build and publish container image
         uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294  # v7.0.0
@@ -275,4 +275,4 @@ jobs:
     with:
       package_name: ${{ matrix.package_name }}
       version: ${{ needs.merge-build.outputs.version }}
-      branch: ${{ github.event.inputs.branch || (github.ref != 'refs/heads/main' && format('SNAPSHOT-{0}', github.ref_name)) || '' }}
+      branch: ${{ github.event.inputs.branch || (github.ref != 'refs/heads/main' && github.ref_name) || '' }}