diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f479121..a9becb5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./gradlew build --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 eb77b40..5deb1cc 100644 --- a/.releaserc +++ b/.releaserc @@ -24,6 +24,12 @@ ] } ], + [ + "@saithodev/semantic-release-backmerge", + { + "branches": ["dev"] + } + ], "@semantic-release/github" ] }