From 4b1be8c647b098f1cdb3d8e33fd8be8d77bda10e Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 14 Dec 2022 01:05:16 +0100 Subject: [PATCH 1/3] ci: only back-merge from `main` branch to `dev` --- .releaserc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 5deb1cc..70f4b3b 100644 --- a/.releaserc +++ b/.releaserc @@ -27,7 +27,7 @@ [ "@saithodev/semantic-release-backmerge", { - "branches": ["dev"] + "branches": [{from: "main", to: "dev"}] } ], "@semantic-release/github" From 6b889557abc3242bd73e9fb7f6ad555c0ace4971 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 15 Dec 2022 01:07:48 +0100 Subject: [PATCH 2/3] ci: stash before rebasing --- .releaserc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 70f4b3b..5a86b5f 100644 --- a/.releaserc +++ b/.releaserc @@ -27,7 +27,8 @@ [ "@saithodev/semantic-release-backmerge", { - "branches": [{from: "main", to: "dev"}] + branches: [{from: "main", to: "dev"}], + clearWorkspace: true } ], "@semantic-release/github" From cd1b72e07857c29c6ec61d8f490cfd4288878662 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 15 Dec 2022 01:08:00 +0100 Subject: [PATCH 3/3] ci: remove unnecessary step --- .github/workflows/release.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9becb5..d7b2afd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,10 +29,6 @@ jobs: with: node-version: "latest" cache: 'npm' - - name: Build with Gradle - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./gradlew build --no-daemon - name: Setup semantic-release run: npm install semantic-release @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D - name: Release