.....
This commit is contained in:
parent
569b235726
commit
1dcebf80fa
|
@ -43,7 +43,7 @@ jobs:
|
||||||
- name: push
|
- name: push
|
||||||
run: |
|
run: |
|
||||||
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
|
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
|
||||||
git rebase origin/master
|
git rebase origin/master --strategy ours
|
||||||
echo no development branch so pushing
|
echo no development branch so pushing
|
||||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
|
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
|
||||||
|
|
Loading…
Reference in New Issue