Skip to content

Commit

Permalink
ci: 馃敡 auto merge release branch back into beta
Browse files Browse the repository at this point in the history
Keeps latest file updated in develop branch for any release
  • Loading branch information
MrDynamo committed Apr 26, 2024
1 parent 291cb18 commit 43b4c9d
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/semantic-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,12 @@ jobs:
SENTRY_PROJECT: wizarr-frontend wizarr-backend
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
CURRENT_BRANCH: ${{ steps.branch-name.outputs.current_branch }}

# Sync master/beta back into develop so 'latest' file is always up to date
- name: Merge working branch -> develop
uses: devmasx/merge-branch@master
with:
type: now
github_token: ${{ steps.gh_app.outputs.token }}
from_branch: ${{ github.ref_name }}
target_branch: develop

0 comments on commit 43b4c9d

Please sign in to comment.