another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

.
convert-to-yml / develop-branch (push) Failing after 28s Details

This commit is contained in:
gilesb 2023-10-23 16:49:56 +01:00
parent db7f4fcbc8
commit 2402bf5f91
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitea/workflows/build->develop.yml
View File

@ -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 ours --force-rebase
git rebase origin/master --strategy-option ours
git log -5
echo no development branch so pushing
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
@ -59,7 +59,9 @@ jobs:
echo 'pushed new branch and created pr';
else
if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours --force-rebase
git merge -X ours origin/${{ env.DEVELOPMENT_BRANCH }}
git commit -m "merged"
# git rebase origin/${{ env.DEVELOPMENT_BRANCH }} --strategy-option ours --force-rebase
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
else
echo 'no changes so no push'

4
.gitea/workflows/develop -> build.yml
View File

@ -43,7 +43,9 @@ 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 ours --force-rebase
git merge -X ours origin/${{ env.BUILD_BRANCH }}
git commit -m "megerd"
# git rebase origin/${{ env.BUILD_BRANCH }} --strategy-option ours
git push origin HEAD:${{ env.BUILD_BRANCH }}
else
echo 'no changes so no push'