-
Notifications
You must be signed in to change notification settings - Fork 539
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1416bbd
commit b2ce7c8
Showing
1 changed file
with
34 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
name: Auto-Update Dev Branch from Master | ||
|
||
on: | ||
push: | ||
branches: | ||
- master # Trigger workflow on commits to 'dev' branch | ||
|
||
jobs: | ||
update-main: | ||
runs-on: ubuntu-latest | ||
permissions: | ||
contents: write # Required to push to protected branches | ||
|
||
steps: | ||
- name: Checkout Main Branch | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: dev | ||
fetch-depth: 0 | ||
ssh-key: ${{ secrets.DEPLOY_KEY }} | ||
|
||
- name: Configure Git User | ||
run: | | ||
git config user.name "github-actions" | ||
git config user.email "github-actions@github.com" | ||
- name: Merge auto-update into dev | ||
run: | | ||
git fetch origin master:master | ||
git merge --no-ff master -m "Auto-merge updates from master branch" | ||
- name: Push Changes to Main | ||
run: | | ||
git push origin dev |