Skip to content

Commit

Permalink
🚀 chore(release.yml): add step to merge changes from main into dev br…
Browse files Browse the repository at this point in the history
…anch

The release workflow now includes a step to merge changes from the main branch into the dev branch. This ensures that any updates made in the main branch are reflected in the dev branch, allowing for continuous integration and development.
  • Loading branch information
VampireChicken12 committed Sep 10, 2023
1 parent 3fa8e9d commit b9d9a38
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- dev

jobs:
build-and-release:
Expand All @@ -25,3 +24,14 @@ jobs:
run: npx semantic-release
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Merge changes from main into dev
run: |
# Switch to the dev branch
git checkout dev
# Merge changes from the main branch into dev
git merge main
# Push changes to the dev branch
git push origin dev

0 comments on commit b9d9a38

Please sign in to comment.