Skip to content

Commit

Permalink
ci: update changelog action
Browse files Browse the repository at this point in the history
  • Loading branch information
ephrimlawrence committed Feb 19, 2024
1 parent 74c0f12 commit 1d52bf9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/changelog-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Conventional Changelog Action
on:
push:
branches:
- master
- main
merge_group:
branches:
- master
- main

jobs:
changelog:
Expand All @@ -27,9 +27,9 @@ jobs:
output-file: "CHANGELOG.md"
skip-on-empty: false

- name: Deploy to stable => Merge master -> stable
- name: Deploy to stable => Merge main -> stable
run: |
git fetch origin stable
git checkout stable
git merge master
git merge main
git push

0 comments on commit 1d52bf9

Please sign in to comment.