Skip to content

Commit

Permalink
Add automatic merge action
Browse files Browse the repository at this point in the history
  • Loading branch information
PiotrMachowski committed Aug 15, 2022
1 parent 2bc79ab commit 3fcaf13
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/automerge.yaml
@@ -0,0 +1,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

0 comments on commit 3fcaf13

Please sign in to comment.