Merge pull request '....' (#206) from develop/tags-1 into master

Reviewed-on: #206
This commit is contained in:
giles 2023-10-23 21:21:42 +00:00
commit edb34ddd0d
2 changed files with 5 additions and 4 deletions

View File

@ -72,7 +72,7 @@ jobs:
- name: make PR - name: make PR
run: | run: |
../tea pr ls -f=base,head -o=csv ../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=" ../tea pr c --base=master --head=${{ github.ref_name }} --description="
development pull request development pull request
this PR is will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }}) this PR is will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})

View File

@ -21,11 +21,12 @@ jobs:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4 - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with: with:
token: ${{ secrets.BOT_TOKEN }} token: ${{ secrets.BOT_TOKEN }}
- name: tag - name: get tag
run: | run: |
git fetch --tags
git tag -l
../tea r ls -o=simple ../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 - name: delete develop branch
id: delete_develop_branch id: delete_develop_branch
run: git push origin --delete ${{ github.head_ref }} run: git push origin --delete ${{ github.head_ref }}