Commit fe64e14
authored
Create merge.yml
1 parent f96b891 commit fe64e14
1 file changed
Lines changed: 25 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,25 @@ | |||
| 1 | + name: Merge | ||
| 2 | + | ||
| 3 | + # Only trigger, when the build workflow succeeded | ||
| 4 | + on: | ||
| 5 | + workflow_run: | ||
| 6 | + workflows: ["Sonar_Test"] | ||
| 7 | + types: | ||
| 8 | + - completed | ||
| 9 | + | ||
| 10 | + jobs: | ||
| 11 | + merge-master-back-to-dev: | ||
| 12 | + runs-on: ubuntu-latest | ||
| 13 | + steps: | ||
| 14 | + - uses: actions/checkout@v2 | ||
| 15 | + - name: Set Git config | ||
| 16 | + run: | | ||
| 17 | + git config --local user.email "actions@github.com" | ||
| 18 | + git config --local user.name "Github Actions" | ||
| 19 | + - name: Merge master back to dev | ||
| 20 | + run: | | ||
| 21 | + git fetch --unshallow | ||
| 22 | + git checkout dev | ||
| 23 | + git pull | ||
| 24 | + git merge --no-ff master -m "Auto-merge master back to dev" | ||
| 25 | + git push | ||
0 commit comments