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

...
build-develop-branch / build-branch (push) Failing after 26s Details
build-develop-branch / delete (pull_request) Successful in 16s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details

This commit is contained in:
gilesb 2023-10-23 18:27:52 +01:00 committed by giles
parent 725dbc3b0d
commit 2ac700a5cc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,8 @@ 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 -Xours origin/master git rebase -Xtheirs origin/master
ls
git log -5 git log -5
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 }};