Skip to content

Commit 071a4bb

Browse files
authored
Create sync-v24.yml
1 parent 84cea87 commit 071a4bb

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

.github/workflows/sync-v24.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Sync v24 with latest v24.x
2+
3+
on:
4+
push:
5+
branches:
6+
- v24.9
7+
8+
jobs:
9+
sync-branches:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout target branch (v24)
14+
uses: actions/checkout@v4
15+
with:
16+
ref: v24
17+
fetch-depth: 0
18+
token: ${{ secrets.GITHUB_TOKEN }}
19+
20+
- name: Configure Git
21+
run: |
22+
git config user.name "github-actions[bot]"
23+
git config user.email "github-actions[bot]@users.noreply.github.com"
24+
25+
- name: Add v24.9 branch as remote ref
26+
run: |
27+
git fetch origin v24.9:v24.9
28+
29+
- name: Merge v24.9 into v24 (prefer v24.9 content)
30+
run: |
31+
# Use 'theirs' strategy for automatic conflict resolution
32+
git merge v24.9 -X theirs --no-edit || true
33+
34+
- name: Push updated v24 branch
35+
run: |
36+
# Only push if there are changes
37+
if ! git diff --quiet HEAD; then
38+
git push origin v24
39+
fi

0 commit comments

Comments
 (0)