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) Successful in 32s Details

This commit is contained in:
gilesb 2023-10-23 16:22:49 +01:00
parent f37f016a98
commit 33d70d88ff
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"\/}
- name: status
run: |
git branch -r
echo $(git branch -r | grep -Fx " origin/${{ env.BUILD_BRANCH }}" | wc -c)
ls
- name: push
run: |
git add -A
@ -44,7 +43,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'