Attempt at solving the tag situation

Signed-off-by: Simon Beaudoin <sbeaudoi@qti.qualcomm.com>

Author: simonbeaudoin0935

.github/workflows/qcom-promote-upstream-reusable-workflow.yml

@@ -205,7 +205,6 @@ jobs:
       - name: Merge upstream tag into upstream/latest
         working-directory: ./package-repo
         run: |
-
           # If the upstream/latest branch does not exist yet, create it and give it
           # the history of upstream directly, instead of creating an --allow-empty commit
           # which will be dragged along.
@@ -214,27 +213,11 @@ jobs:
           else
             # The branch exists, check it out and promote it to the upstream tag
             git checkout upstream/latest
-            git merge ${{inputs.upstream-tag}}
-          fi
-
-      - name: Strip .github/workflows from upstream/latest
-        working-directory: ./package-repo
-        run: |
-          # Since Github does not allow pushing workflows using the GITHUB_TOKEN, remove .github/workflows if present.
-
-          git config user.name "${{vars.DEB_PKG_BOT_CI_NAME}}"
-          git config user.email "${{vars.DEB_PKG_BOT_CI_EMAIL}}"
-
-          git checkout upstream/latest
 
-          # Remove .github/workflows/ if present to avoid GITHUB_TOKEN push restrictions.
-          # The upstream source repo workflows are not relevant to the packaging repo.
-          if [ -d .github/workflows ]; then
-            git rm -rf .github/
-            git commit -s -m "Remove .github/workflows from upstream source"
+            ../qcom-build-utils/scripts/merge_debian_packaging_upstream ${{inputs.upstream-tag}}
           fi
 
-      - name: Merge upstream tag into packaging branch
+      - name: Merge upstream into packaging branch
         working-directory: ./package-repo
         run: |
           git config user.name "${{vars.DEB_PKG_BOT_CI_NAME}}"
@@ -244,7 +227,7 @@ jobs:
 
           git checkout -b debian/pr/${{env.NORMALIZED_VERSION}}-1
 
-          ../qcom-build-utils/scripts/merge_debian_packaging_upstream ${{inputs.upstream-tag}}
+          git merge --no-edit upstream/latest
 
       - name: Promote Changelog
         working-directory: ./package-repo