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 18:10:02 +01:00 committed by giles
parent ff24a85d78
commit a1a4d3831a
2 changed files with 3 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,7 @@ 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 origin/master --strategy-option ours git rebase -Xtheirs origin/master
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 }};
@ -59,6 +59,7 @@ jobs:
echo 'pushed new branch and created pr'; echo 'pushed new branch and created pr';
else else
if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
#git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }}
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
git -C ../cloned fetch origin #--depth=1 git -C ../cloned fetch origin #--depth=1
git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH

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

@ -43,6 +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 -Xtheirs origin/${{ env.BUILD_BRANCH }}
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
git -C ../cloned fetch origin #--depth=1 git -C ../cloned fetch origin #--depth=1
git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH