forked from pmmp/PocketMine-MP
-
Notifications
You must be signed in to change notification settings - Fork 0
67 lines (57 loc) · 1.74 KB
/
auto-merge.yml
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
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
name: Merge head into child branch
on:
workflow_dispatch:
inputs:
head:
description: 'Branch to merge from'
required: true
type: choice
options:
- stable
- minor-next
base:
description: 'Branch to merge into'
required: true
type: choice
options:
- minor-next
- major-next
jobs:
merge:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch all branches and their history
- name: Check if head and base are the same
id: check-branches
run: |
if [ "${{ github.event.inputs.head }}" == "${{ github.event.inputs.base }}" ]; then
echo "::error::Head and base branches cannot be the same"
exit 1
fi
- name: Fetch all branches
run: git fetch --all
- name: Checkout base branch
run: git checkout ${{ github.event.inputs.base }}
- name: Set Git config
run: |
git config user.name github-actions
git config user.email [email protected]
- name: Attempt to merge head into base
id: merge
run: |
git merge --no-commit ${{ github.event.inputs.head }} || echo "Merge conflict detected" > conflict.txt
- name: Check for merge conflicts
id: check-conflict
run: |
if [ -f conflict.txt ]; then
echo "::error::Merge conflict detected"
exit 1
fi
- name: Commit the merge
if: steps.check-conflict.outcome == 'success'
run: |
git commit -m "Merge '${{ github.event.inputs.head }}' into ${{ github.event.inputs.base }}"
git push origin ${{ github.event.inputs.base }}