feat: merge main back into develop

tinogo · Dec 1, 2023 · 0ac4626 · 0ac4626
1 parent e18c211
commit 0ac4626
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -22,17 +22,12 @@ jobs:
       - name: Clone main repository
         if: ${{ steps.release.outputs.release_created }}
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Checkout develop branch
-        if: ${{ steps.release.outputs.release_created }}
-        run: git checkout develop
-
-      - name: Merge main into develop branch
-        if: ${{ steps.release.outputs.release_created }}
-        run: git merge --no-ff main
 
-      - name: Push develop
+      - name: Merge main back to develop
         if: ${{ steps.release.outputs.release_created }}
-        run: git push --set-upstream origin develop
+        run: |
+          git fetch --unshallow
+          git checkout develop
+          git pull
+          git merge --no-ff main -m "Auto-merge main back to develop"
+          git push