fix: image tag

Signed-off-by: Carlos Feria <2582866+carlosthe19916@users.noreply.github.com>

Author: carlosthe19916

.github/workflows/ci-e2e.yaml

@@ -39,25 +39,26 @@ jobs:
     outputs:
       image_tag: ${{ steps.set-outputs.outputs.image_tag }}
     steps:
-      - name: Extract env vars for main
+      - name: Extract vars for Pull Request
         shell: bash
-        if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'main') || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main') }}
-        run: |
-          echo "image_tag=latest" >> $GITHUB_ENV
-      - name: Extract env vars for other branches on PR
-        shell: bash
-        if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }}
+        if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
         run: |
           branch=${{ github.event.pull_request.base.ref }}
-          branch_version="${branch#release/}"
-          echo "image_tag=$branch_version" >> $GITHUB_ENV
-      - name: Extract env vars for other branches on Push
+          image_tag="latest"
+          if [[ "$branch" != "main" ]]; then
+            image_tag="${branch#release/}"
+          fi
+          echo "image_tag=image_tag" >> $GITHUB_ENV
+      - name: Extract vars for Push
         shell: bash
-        if: ${{ github.event_name != 'pull_request' && contains(github.ref, 'refs/heads/main') == false }}
+        if: ${{ github.event_name != 'pull_request' && github.event_name != 'merge_group' }}
         run: |
           branch=$(echo ${GITHUB_REF#refs/heads/})
-          branch_version="${branch#release/}"
-          echo "image_tag=$branch_version" >> $GITHUB_ENV
+          image_tag="latest"
+          if [[ "$branch" != "main" ]]; then
+            image_tag="${branch#release/}"
+          fi
+          echo "image_tag=$image_tag" >> $GITHUB_ENV
       - name: Set outputs
         id: set-outputs
         run: |