-
Notifications
You must be signed in to change notification settings - Fork 158
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #155 from jammsen/develop
Added new merge flow
- Loading branch information
Showing
1 changed file
with
23 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,23 @@ | ||
name: Pull request to master | ||
on: | ||
pull_request: | ||
branches: [master] | ||
types: [closed] | ||
jobs: | ||
merge-master-back-to-dev: | ||
if: github.event.pull_request.merged == true | ||
timeout-minutes: 1 | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Set Git config | ||
run: | | ||
git config --local user.email "[email protected]" | ||
git config --local user.name "Github Actions" | ||
- name: Merge master back to dev | ||
run: | | ||
git fetch --unshallow | ||
git checkout develop | ||
git pull | ||
git merge --no-ff master -m "Auto-merge master back to dev" | ||
git push |