diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index f11810d..0289f02 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -15,6 +15,11 @@ jobs: fetch-depth: '10' - env: env 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 with: node-version: '20' @@ -66,27 +71,19 @@ jobs: fi; - name: make PR 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 -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 - ./tea pr c --base=master --head=${{ github.ref_name }} --description=" + ../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 }}) " -t="WIP: ${{ github.event.head_commit.message }}" fi - 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 - pr=$(./tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1) + 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//[\"\'\`]/}" echo ::set-env name=PR::$PR - rm ./tea - name: make pull request comment run: | - curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea - chmod +x ./tea - ./tea c $PR "this branch has been built on [${{ env.BUILD_BRANCH }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})" + ../tea c $PR "this branch has been built on [${{ env.BUILD_BRANCH }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})" \ No newline at end of file diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index 4827c11..7decd0e 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -13,19 +13,19 @@ jobs: if: github.event.pull_request.merged == true runs-on: ubuntu-latest 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 with: 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 run: | git fetch --tags git tag -l + ../tea r ls -o=simple - name: delete develop branch id: delete_develop_branch run: git push origin --delete ${{ github.head_ref }} diff --git a/.gitea/workflows/tea.yml b/.gitea/workflows/tea.yml new file mode 100644 index 0000000..e0e700d --- /dev/null +++ b/.gitea/workflows/tea.yml @@ -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 diff --git a/README.md b/README.md index c8370f3..a0ae6e5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ push deployed -pull to production PC and import. +pull to production PC and import pull to development, import, modify, export push from development to format branch diff --git a/package.json b/package.json deleted file mode 100644 index 1587a66..0000000 --- a/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "1.0.0" -}