Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2bc79ab
commit 3fcaf13
Showing
1 changed file
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |