fix: next attempts for auto-merge

osslabz · Oct 25, 2024 · 956c23a · 956c23a
1 parent 9931660
commit 956c23a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml
@@ -48,9 +48,9 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
 
       - name: merge-main-to-dev
-        uses: devmasx/merge-branch@master
-        with:
-          type: now
-          target_branch: dev
-          message: "[release] merge released main back to dev"
-          github_token: $${{secrets.PAT_GH_CI}}
+        run: |
+          git fetch --unshallow
+          git checkout dev
+          git pull
+          git merge --no-ff main -m "[release] auto-merge released main back to dev"
+          git push