From bb7316f93b8dedc0b25aec64e2b74315ad41c0ad Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 01:19:50 +0100 Subject: [PATCH] ........... --- .gitea/workflows/build->develop.yml | 12 ------------ .gitea/workflows/tag->deploy.yml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 452a013..eced80e 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -40,15 +40,3 @@ jobs: git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git merge --squash ${{ github.ref_name }} git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - - name: make pull request - #git fetch - # git merge origin/master --allow-unrelated-histories --strategy-option=ours - # git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - run: | - curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea - chmod +x ./tea - ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} - if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then - ./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="development pull request" -t="WIP: ${{ github.event.head_commit.message }}" - fi - rm ./tea diff --git a/.gitea/workflows/tag->deploy.yml b/.gitea/workflows/tag->deploy.yml index 109b498..15dd575 100644 --- a/.gitea/workflows/tag->deploy.yml +++ b/.gitea/workflows/tag->deploy.yml @@ -30,5 +30,5 @@ jobs: git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" git add -A - git commit -a -m ""${{ github.ref_name }} -> refs/heads/deployed-${{ github.ref_name }} "" + git commit -a -m "${{ github.ref_name }} -> refs/heads/deployed-${{ github.ref_name }} " git push origin HEAD:refs/heads/deployed-${{ github.ref_name }}