diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3a0d29d..c280457 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,6 +3,7 @@ on: push: branches: - main + - stage jobs: run-test: runs-on: ubuntu-latest diff --git a/.releaserc.yaml b/.releaserc.yaml index 1f30d34..5c15b37 100644 --- a/.releaserc.yaml +++ b/.releaserc.yaml @@ -19,6 +19,10 @@ verifyConditions: - "@semantic-release/git" - "@semantic-release/github" - path: "@saithodev/semantic-release-backmerge" + branches: + - from: main + to: stage + backmergeStrategy: merge analyzeCommits: - path: "@semantic-release/commit-analyzer" @@ -90,7 +94,7 @@ success: backmergeBranches: - from: main to: stage - backmergeStrategy: "rebase" + backmergeStrategy: "merge" message: "chore(release): backmerge ${nextRelease.version} [skip ci]" fail: - path: "@semantic-release/github"