File tree Expand file tree Collapse file tree 1 file changed +4
-1
lines changed
Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -8,19 +8,20 @@ inputs:
88
99runs :
1010 using : ' composite'
11- shell : bash
1211 steps :
1312 - name : Checkout
1413 uses : actions/checkout@v2
1514
1615 - uses : fregante/setup-git-user@v2
1716
1817 - name : Fetch branches and update working directory
18+ shell : bash
1919 run : |
2020 git fetch origin ${{ github.event.pull_request.head.ref }}
2121 git fetch origin ${{ github.event.pull_request.base.ref }}
2222
2323 - name : Check if branches are up to date
24+ shell : bash
2425 id : checkBranches
2526 run : |
2627 git checkout ${{ github.event.pull_request.head.ref }}
3435 fi
3536
3637 - name : Merge base branch into PR branch
38+ shell : bash
3739 if : steps.checkBranches.outputs.mergeRequired == 'true'
3840 run : |
3941 git merge --no-edit --no-commit origin/${{ github.event.pull_request.base.ref }}
4446 git commit -m "Merge ${{ github.event.pull_request.base.ref }} into ${{ github.event.pull_request.head.ref }}"
4547
4648 - name : Push changes
49+ shell : bash
4750 if : steps.checkBranches.outputs.mergeRequired == 'true'
4851 run : |
4952 git push origin ${{ github.event.pull_request.head.ref }}
You can’t perform that action at this time.
0 commit comments