-
-
Notifications
You must be signed in to change notification settings - Fork 14
28 lines (26 loc) · 744 Bytes
/
Copy pathautomerge.yaml
File metadata and controls
28 lines (26 loc) · 744 Bytes
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
name: 'Automatically merge master -> dev'
on:
push:
branches:
- master
jobs:
build:
name: Automatically merge master to dev
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
name: Git checkout
with:
fetch-depth: 0
- name: Merge master -> dev
run: |
git config user.name "GitHub Actions"
git config user.email "PiotrMachowski@users.noreply.github.com"
if (git checkout dev)
then
git merge --ff-only master || git merge --no-commit master
git commit -m "Automatically merge master -> dev" || echo "No commit needed"
git push origin dev
else
echo "No dev branch"
fi