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:22:49 +01:00 committed by giles
parent 83a57e5703
commit 3459cac714
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,7 @@ jobs:
echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/} echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
- name: status - name: status
run: | run: |
git branch -r ls
echo $(git branch -r | grep -Fx " origin/${{ env.BUILD_BRANCH }}" | wc -c)
- name: push - name: push
run: | run: |
git add -A git add -A
@ -44,7 +43,7 @@ jobs:
git push origin HEAD:${{ env.BUILD_BRANCH }}; git push origin HEAD:${{ env.BUILD_BRANCH }};
else else
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then 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 }} git push origin HEAD:${{ env.BUILD_BRANCH }}
else else
echo 'no changes so no push' echo 'no changes so no push'