Skip to content

Commit d69f4ca

Browse files
authored
Update main_to_dev_merge.yml
1 parent 8829a46 commit d69f4ca

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed
Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
name: Merge Main to Dev
1+
name: Daily Merge Main to Dev
22

33
on:
44
schedule:
5-
- cron: '0 0 * * *' # Run daily at midnight UTC
5+
- cron: '0 0 * * *' # Runs every day at 00:00 UTC
66

77
jobs:
8-
merge:
8+
merge-main-to-dev:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- name: Checkout code
13-
uses: actions/checkout@v2
12+
- name: Checkout repository
13+
uses: actions/checkout@v3
1414

15-
- name: Merge Main to Dev
16-
run: |
17-
git checkout dev
18-
git pull origin dev
19-
git fetch origin main
20-
git merge origin/main --no-edit
21-
git push origin dev
15+
- name: Fetch latest changes
16+
run: git fetch origin
17+
18+
- name: Merge main branch to dev branch
19+
run: git merge origin/main -m "Merge main branch to dev"
20+
21+
- name: Push dev branch changes
22+
run: git push origin dev

0 commit comments

Comments
 (0)