diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 0289f02..6df3931 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -72,7 +72,7 @@ jobs: - name: make PR run: | ../tea pr ls -f=base,head -o=csv - if [[ $(./tea pr ls -f=base,head -o=csv | grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then + if [[ $(../tea pr ls -f=base,head -o=csv | grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then ../tea pr c --base=master --head=${{ github.ref_name }} --description=" development pull request this PR is will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }}) diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index 7decd0e..bce2525 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -21,11 +21,12 @@ jobs: - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 with: token: ${{ secrets.BOT_TOKEN }} - - name: tag + - name: get tag run: | - git fetch --tags - git tag -l ../tea r ls -o=simple + version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)" + version=$version | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g' + ../tea r c --note="this isrelease ${version}" --tag=${version} --title=${version} --target=${{ github.sha }} - name: delete develop branch id: delete_develop_branch run: git push origin --delete ${{ github.head_ref }}