-
Notifications
You must be signed in to change notification settings - Fork 0
50 lines (41 loc) · 1.02 KB
/
SyncMainToDev.yml
File metadata and controls
50 lines (41 loc) · 1.02 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
name: Sync main to dev
permissions:
contents: write
on:
workflow_dispatch:
push:
branches:
- main
workflow_call:
concurrency:
group: sync-main-to-dev
cancel-in-progress: false
jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}
- name: Configure Git
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
- name: Checkout dev branch
run: |
git fetch origin dev
git checkout dev
- name: Merge main into dev
run: |
set -e
if git merge origin/main --no-edit; then
echo "✅ Merge successful."
else
echo "❌ Merge failed due to conflicts. Manual intervention required."
exit 1
fi
- name: Push changes
run: |
git push origin dev