test

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

Author: simonbeaudoin0935

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

@@ -202,7 +202,7 @@ jobs:
             exit 1
           fi
           
-      - name: Pre-populate the upstream/latest branch if first promotion
+      - name: Merge upstream tag into upstream/latest
         working-directory: ./package-repo
         run: |
 
@@ -214,7 +214,24 @@ jobs:
           else
             # The branch exists, check it out and promote it to the upstream tag
             git checkout upstream/latest
-            git merge --ff-only ${{inputs.upstream-tag}}
+            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/workflows
+            git commit -s -m "Remove .github/workflows from upstream source"
           fi
 
       - name: Merge upstream tag into packaging branch