diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1355b13e..63eff0f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: - name: Build with Gradle 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 0214a768..cd4494b8 100644 --- a/.releaserc +++ b/.releaserc @@ -29,6 +29,13 @@ } ] } + ], + [ + "@saithodev/semantic-release-backmerge", + { + branches: [{from: "main", to: "dev"}], + clearWorkspace: true + } ] ] }