diff --git a/.github/workflows/release-new-version.yml b/.github/workflows/release-new-version.yml index d86f08d9b..0e32d3504 100644 --- a/.github/workflows/release-new-version.yml +++ b/.github/workflows/release-new-version.yml @@ -65,7 +65,7 @@ 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 @@ -73,6 +73,14 @@ jobs: 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: | {