From 30416281808dc3611146dc8b3574ff058c82704b Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 14 Dec 2022 00:28:02 +0100 Subject: [PATCH] ci: back-merge releases back into `dev` branch --- .github/workflows/release.yml | 2 +- .releaserc | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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"] + } ] ] }