diff --git a/.github/workflows/merge-main.yaml b/.github/workflows/merge-main.yaml index bbcc8ffc83..1dec436fde 100644 --- a/.github/workflows/merge-main.yaml +++ b/.github/workflows/merge-main.yaml @@ -15,9 +15,9 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 20 - name: git config @@ -25,10 +25,13 @@ jobs: git config user.name ${{ github.actor }} - name: Merge dev -> main + with: + github-token: ${{ secrets.GITHUB_TOKEN }} run: | git status - git pull git fetch + git checkout dev + git pull git checkout main git rebase dev git push origin main