fix: configure auto-merge

osslabz · Oct 25, 2024 · ee2d14d · ee2d14d
1 parent 19a35a8
commit ee2d14d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml
@@ -45,4 +45,12 @@ jobs:
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+          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}}