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

Reviewed-on: #205
This commit is contained in:
giles 2023-10-23 20:45:27 +00:00
commit 15ca807891
5 changed files with 44 additions and 22 deletions

View File

@ -15,6 +15,11 @@ jobs:
fetch-depth: '10' fetch-depth: '10'
- env: env - env: env
run: printenv run: printenv
- name: get tea
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 }}
- uses: http://sigyl.com:3000/actions/setup-node@v3 - uses: http://sigyl.com:3000/actions/setup-node@v3
with: with:
node-version: '20' node-version: '20'
@ -66,27 +71,19 @@ jobs:
fi; fi;
- name: make PR - name: make PR
run: | run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea ../tea pr ls -f=base,head -o=csv
chmod +x ./tea
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
./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 }})
" -t="WIP: ${{ github.event.head_commit.message }}" " -t="WIP: ${{ github.event.head_commit.message }}"
fi fi
- name: get PR number - name: get PR number
run: | run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea pr=$(../tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1)
chmod +x ./tea
pr=$(./tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1)
export PR="${pr//[\"\'\`]/}" export PR="${pr//[\"\'\`]/}"
echo ::set-env name=PR::$PR echo ::set-env name=PR::$PR
rm ./tea
- name: make pull request comment - name: make pull request comment
run: | run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea ../tea c $PR "this branch has been built on [${{ env.BUILD_BRANCH }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})"
chmod +x ./tea
./tea c $PR "this branch has been built on [${{ env.BUILD_BRANCH }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})"

View File

@ -13,19 +13,19 @@ jobs:
if: github.event.pull_request.merged == true if: github.event.pull_request.merged == true
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: get tea
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 }}
- 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: 'Automated Version Bump'
uses: 'http://sigyl.com:3000/actions/gh-action-bump-version@package-json-error'
env:
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
with:
custom-git-domain: 'sigyl.com/git'
- name: tag - name: tag
run: | run: |
git fetch --tags git fetch --tags
git tag -l git tag -l
../tea r ls -o=simple
- 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 }}

28
.gitea/workflows/tea.yml Normal file
View File

@ -0,0 +1,28 @@
name: tea
on:
workflow_call:
secrets:
token:
required: true
jobs:
tea:
runs-on: ubuntu-latest
steps:
- name: get tea
run: |
echo tea please!
#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.token }}
#echo thank you!
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4
with:
token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10'
- name: ls
run: ls

View File

@ -19,7 +19,7 @@ push deployed
pull to production PC and import. pull to production PC and import
pull to development, import, modify, export pull to development, import, modify, export
push from development to format branch push from development to format branch

View File

@ -1,3 +0,0 @@
{
"version": "1.0.0"
}