Skip to content

Commit

Permalink
fix(release): merge develop branch to master
Browse files Browse the repository at this point in the history
  • Loading branch information
stonebuzz committed Aug 31, 2023
1 parent 864f907 commit 69e1842
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion .github/workflows/release-new-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,22 @@ jobs:
- name: "Update Full ChangeLog"
run: echo "${{ env.full_change_log }}" > CHANGELOG.md

- name: Push Update to repo
- name: Update develop branch
uses: EndBug/add-and-commit@v9
with:
default_author: github_actions
add: "['CHANGELOG.md', 'package.json']" #only this files will be added
push: origin HEAD:develop
message: "ci(release): release new version ${{ env.tag_name }}"

- name: Merge develop -> master
uses: devmasx/merge-branch@master
with:
type: now
from_branch: development
target_branch: master
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: "Extract Clean Git Log (Conventional Commit)"
run: |
{
Expand Down

0 comments on commit 69e1842

Please sign in to comment.