diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32ff2a4b..f1204f3a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./gradlew build generateMeta --no-daemon - name: Setup semantic-release - run: npm install semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D + run: npm install semantic-release @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D - name: Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.releaserc b/.releaserc index 1d2937b1..23162845 100644 --- a/.releaserc +++ b/.releaserc @@ -38,6 +38,12 @@ } ] } + ], + [ + "@saithodev/semantic-release-backmerge", + { + "branches": ["dev"] + } ] ] }