From b8b545850e886b25dd30fd19cf74d520557ef169 Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 11:33:44 +0100 Subject: [PATCH] kdjdjdjdjdjdjd --- .gitea/workflows/build->develop.yml | 12 ------------ .gitea/workflows/develop -> build.yml | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 4c0db65..e451947 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -43,18 +43,6 @@ jobs: CI_COMMIT_AUTHOR: Continuous Integration run: | git branch -r - - name: get PR number - 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 }} - ./tea pr ls -f=base,head,index - echo here - export PRR=$(./tea pr ls -f=base,head,index | grep develop/35 | tr -d ' ') - echo i did it - #echo ::set-env name=PR::$(./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1) - #rm ./tea - #echo PR: $PR - name: diff env: CI_COMMIT_MESSAGE: converted to yml for review. diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index e7befdc..3594135 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -27,11 +27,11 @@ jobs: ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} ./tea pr ls -f=base,head,index echo here - ./tea pr ls -f=base,head,index | grep "whynot" + echo $(./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |") echo i did it - #echo ::set-env name=PR::$(./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1) - #rm ./tea - #echo PR: $PR + echo ::set-env name=PR::$(./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1) + rm ./tea + echo PR: $PR - run: git fetch - name: get build branch name run: |