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

...

This commit is contained in:
gilesb 2023-10-23 16:06:50 +01:00 committed by giles
parent e2b24a9dab
commit fa777e887e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.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 theirs
git rebase origin/master --strategy-option ours
git log -5
echo no development branch so pushing
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};

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

@ -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'