From 4fcf8cf4d510a334545b59acbff33af67419247e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mati=CC=81as?= Date: Fri, 3 Jan 2025 10:36:34 -0300 Subject: [PATCH] fix(ci): fix github action login --- .github/workflows/backmerge.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backmerge.yml b/.github/workflows/backmerge.yml index 7de444d4d..244e59ff2 100644 --- 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 'noreply@usecannon.com' - 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