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

Merge pull request 'rebase32' (#189) from develop/rebase-32 into master 

Reviewed-on: #189
This commit is contained in:
giles 2023-10-23 18:05:08 +00:00
parent 76c7be1491 63ba502246
commit bd2be6e8f0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,8 +43,13 @@ 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 -Xtheirs origin/master ls
git log -5 git log -5
git status
git rebase -Xtheirs origin/master
ls
git log -4
git status
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 }};
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea; curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;

2
.gitea/workflows/pr-closed.yml
View File

@ -36,6 +36,8 @@ jobs:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4 - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with: with:
token: ${{ secrets.BOT_TOKEN }} token: ${{ secrets.BOT_TOKEN }}
- name: tag
run: git tag
- name: delete develop branch - name: delete develop branch
id: delete_develop_branch id: delete_develop_branch
run: git push origin --delete ${{ github.head_ref }} run: git push origin --delete ${{ github.head_ref }}