Merge pull request #90 from FullStackWithLawrence/next

chore: try a rebase
FullStackWithLawrence · Nov 17, 2023 · 0a33fed · 0a33fed
2 parents 4670bf9 + dfafe5b
commit 0a33fed
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/.github/workflows/pushMain.yml b/.github/workflows/pushMain.yml
@@ -21,20 +21,9 @@ jobs:
         id: checkout
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
 
-      - name: Rebase and merge
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Action"
-          git checkout main
-          git pull
-          git checkout ${{ github.event.pull_request.head.ref }}
-          git rebase main
-          git checkout main
-          git merge --no-ff ${{ github.event.pull_request.head.ref }}
-          git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:${{ github.event.pull_request.head.ref }}
-
       - name: Merge main into next
         id: merge_main_to_next
         shell: bash
@@ -45,8 +34,9 @@ jobs:
           git checkout main
           git pull
           git checkout next
-          git pull
-          git merge main
+          git rebase main
+          git checkout main
+          git merge --no-ff next
           git push https://${{ env.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:next
 
       - name: Merge main into next-major