diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 053a47c..e1a3c3d 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -43,8 +43,13 @@ jobs: - name: push run: | 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 status + git rebase -Xtheirs origin/master + ls + git log -4 + git status echo no development branch so pushing git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea; diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index 0f10aa6..b27918d 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -36,6 +36,8 @@ jobs: - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 with: token: ${{ secrets.BOT_TOKEN }} + - name: tag + run: git tag - name: delete develop branch id: delete_develop_branch run: git push origin --delete ${{ github.head_ref }}