From 358130ce41cf689354b1b9ba830c77f7adca314b Mon Sep 17 00:00:00 2001 From: giles Date: Sun, 22 Oct 2023 23:47:58 +0100 Subject: [PATCH] ... --- .gitea/workflows/convert-built-to-yml.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.gitea/workflows/convert-built-to-yml.yml b/.gitea/workflows/convert-built-to-yml.yml index 4c0461f..b1746a7 100644 --- a/.gitea/workflows/convert-built-to-yml.yml +++ b/.gitea/workflows/convert-built-to-yml.yml @@ -22,7 +22,7 @@ jobs: - name: get development branch name run: | firstString=${{ github.ref_name }} - secondString="development-" + secondString="develop-" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build-/"$secondString"} - name: GIT commit and push all changed files env: @@ -49,15 +49,3 @@ jobs: # converted from batch" # git merge origin/master --strategy-option=ours --allow-unrelated # git push -f 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