From 52318d68163cc3893342ebe396e1d0f9567da0d6 Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 00:57:08 +0100 Subject: [PATCH] jjjjj --- .gitea/workflows/build-develop-branch.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build-develop-branch.yml b/.gitea/workflows/build-develop-branch.yml index de71340..4ba6cdd 100644 --- a/.gitea/workflows/build-develop-branch.yml +++ b/.gitea/workflows/build-develop-branch.yml @@ -27,6 +27,7 @@ jobs: ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} 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: | @@ -41,7 +42,7 @@ 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 "${{ env.CI_COMMIT_MESSAGE }} yml files converted to xml" + git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " git checkout -b ${{ env.BUILD_BRANCH }} git merge --squash ${{ github.ref_name }} git push origin HEAD:${{ env.BUILD_BRANCH }}