From 5ed6a57df26837e009f406fbd1cd44c29fdaa2da Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 26 Dec 2022 19:10:57 +0100 Subject: [PATCH 1/3] ci: open pull requests to merge `dev` to `main` --- .github/workflows/pull_request.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/pull_request.yml diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml new file mode 100644 index 00000000..d5d04376 --- /dev/null +++ b/.github/workflows/pull_request.yml @@ -0,0 +1,24 @@ +name: PR to main + +on: + push: + branches: + - dev + workflow_dispatch: + +env: + MESSAGE: merge branch \`${{ github.head_ref || github.ref_name }}\` to \`main\` + +jobs: + pull-request: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Open pull request + uses: repo-sync/pull-request@v2 + with: + destination_branch: 'main' + pr_title: 'chore: ${{ env.MESSAGE }}' + pr_body: 'This pull request will ${{ env.MESSAGE }}.' + pr_draft: true \ No newline at end of file From 38e3906240c50002b7fb5e1edd0fe2e22920d535 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 26 Dec 2022 19:19:29 +0100 Subject: [PATCH 2/3] ci: do not release on `build` commit type --- .releaserc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.releaserc b/.releaserc index 6eedc1cf..0214a768 100644 --- a/.releaserc +++ b/.releaserc @@ -7,11 +7,7 @@ } ], "plugins": [ - ["@semantic-release/commit-analyzer", { - "releaseRules": [ - {"type": "build", "release": "patch"} - ] - }], + "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", "@semantic-release/changelog", "gradle-semantic-release-plugin", From 59031d95eae6485c1a80a475d946fc063603b503 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 26 Dec 2022 19:21:23 +0100 Subject: [PATCH 3/3] ci: back-merge releases back into `dev` branch --- .github/workflows/release.yml | 2 +- .releaserc | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 + } ] ] }