fix(ci): fix github action login

usecannon · Jan 3, 2025 · 4fcf8cf · 4fcf8cf
1 parent fefbf2c
commit 4fcf8cf
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/backmerge.yml b/.github/workflows/backmerge.yml
@@ -13,6 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+      GITHUB_TOKEN_USER: ${{ secrets.WORKFLOW_TOKEN_USER }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -24,7 +25,7 @@ jobs:
         run: |
           git config user.name 'Cannon'
           git config user.email '[email protected]'
-          git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git
+          git remote set-url origin https://${GITHUB_TOKEN_USER}:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git
 
       - name: Merge main into dev
         id: merge