...
convert-to-yml / develop-branch (push) Successful in 32s
Details
convert-to-yml / develop-branch (push) Successful in 32s
Details
This commit is contained in:
parent
6926055b17
commit
e11179187f
|
@ -43,7 +43,7 @@ jobs:
|
|||
- name: push
|
||||
run: |
|
||||
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
|
||||
git rebase origin/master --strategy-option theirs
|
||||
git rebase origin/master --strategy-option ours
|
||||
git log -5
|
||||
echo no development branch so pushing
|
||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||
|
|
|
@ -44,7 +44,7 @@ jobs:
|
|||
git push origin HEAD:${{ env.BUILD_BRANCH }};
|
||||
else
|
||||
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||
git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option theirs
|
||||
git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours
|
||||
git push origin HEAD:${{ env.BUILD_BRANCH }}
|
||||
else
|
||||
echo 'no changes so no push'
|
||||
|
|
Loading…
Reference in New Issue