From c677eb979211a6cd36af0443a828669612afd044 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 14 Dec 2022 01:13:45 +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 f4791218..a9becb56 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 49055c41..43725b45 100644 --- a/.releaserc +++ b/.releaserc @@ -33,6 +33,12 @@ } ] } + ], + [ + "@saithodev/semantic-release-backmerge", + { + "branches": [{from: "main", to: "dev"}] + } ] ] }