From 0aa3ccafb845ad068b9961a3c279493db00d768f Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Sun, 22 Oct 2023 20:37:04 +0000 Subject: [PATCH] converted to yml for review. xml files converted to yml --- .gitea/workflows/build-develop-branch.yml | 4 +- .gitea/workflows/convert-to-xml.yml | 2 +- .gitea/workflows/convert-to-yml.yml | 12 ++--- .gitea/workflows/pr-closed.yml | 56 ++++++++++------------- .gitea/workflows/pr-reopened.yml | 54 ++++++++++++++++++++++ 5 files changed, 83 insertions(+), 45 deletions(-) create mode 100644 .gitea/workflows/pr-reopened.yml diff --git a/.gitea/workflows/build-develop-branch.yml b/.gitea/workflows/build-develop-branch.yml index 57cd340..f5db770 100644 --- a/.gitea/workflows/build-develop-branch.yml +++ b/.gitea/workflows/build-develop-branch.yml @@ -23,7 +23,7 @@ jobs: 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=${{ github.token }} + ./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 - name: get build branch name @@ -33,7 +33,7 @@ jobs: echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"} - name: GIT commit and push all changed files env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + CI_COMMIT_MESSAGE: Development branch built to xml. CI_COMMIT_AUTHOR: Continuous Integration run: | git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" diff --git a/.gitea/workflows/convert-to-xml.yml b/.gitea/workflows/convert-to-xml.yml index 2d45382..162331b 100644 --- a/.gitea/workflows/convert-to-xml.yml +++ b/.gitea/workflows/convert-to-xml.yml @@ -22,7 +22,7 @@ jobs: path: '.' - name: GIT commit and push all changed files env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + CI_COMMIT_MESSAGE: approved yml conveted to xml. CI_COMMIT_AUTHOR: Continuous Integration run: | echo ${{ github.ref_name }} diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index 9433e21..bc69a2f 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -26,11 +26,7 @@ jobs: echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format-/"$secondString"} - name: clone run: | - git remote -v - git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - git -C ../cloned remote -v - - git -C ../cloned status + git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned mv ../cloned/.git .. rm -rf ../cloned cp -r . ../cloned @@ -41,11 +37,9 @@ jobs: rm -r .git mv ../cloned/* . mv ../cloned/.git . - ls -la - git status - name: GIT commit and push all changed files env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + CI_COMMIT_MESSAGE: converted to yml for review. CI_COMMIT_AUTHOR: Continuous Integration run: | git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" @@ -76,7 +70,7 @@ jobs: 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=${{ github.token }} + ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then ./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="development pull request" -t="WIP: ${{ github.event.head_commit.message }}" fi diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index c581cdf..1cd48b8 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -4,8 +4,30 @@ on: pull_request: types: - closed + branches: + - 'master' jobs: + delete: + runs-on: ubuntu-latest + steps: + - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 + with: + token: ${{ secrets.BOT_TOKEN }} + - name: delete develop branch + id: delete_develop_branch + run: git push origin --delete ${{ github.head_ref }} + continue-on-error: true + - uses: mainmatter/continue-on-error-comment@v1 + with: + repo-token: ${{ secrets.BOT_TOKEN }} + outcome: ${{ steps.delete_develop_branch.outcome }} + test-id: Error code ${{ matrix.code }} + - name: get build branch name + run: | + firstString=${{ github.head_ref }} + secondString="build-" + echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"} if_merged: if: github.event.pull_request.merged == true runs-on: ubuntu-latest @@ -13,21 +35,13 @@ jobs: - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 with: token: ${{ secrets.BOT_TOKEN }} - - name: on-merge - run: | - echo The PR was merged into ${{ github.event.pull_request.base.ref }} from ${{ github.ref_name }} from ${{ github.ref }} type ${{ github.ref_type }} - echo head ref : ${{ github.event.pull_request.head.ref }} - echo base_ref : ${{ github.base_ref }} - echo head_ref : ${{ github.head_ref }} - echo env: ${{ env.GITHUB_HEAD_REF }} - echo env: ${{ env.GITHUB_BASE_REF }} - name: delete develop branch id: delete_develop_branch run: git push origin --delete ${{ github.head_ref }} continue-on-error: true - uses: mainmatter/continue-on-error-comment@v1 with: - repo-token: ${{ github.token }} + repo-token: ${{ secrets.BOT_TOKEN }} outcome: ${{ steps.delete_develop_branch.outcome }} test-id: Error code ${{ matrix.code }} - name: get build branch name @@ -35,27 +49,3 @@ jobs: firstString=${{ github.head_ref }} secondString="build-" echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"} - - name: delete build branch - id: delete_build_branch - run: git push origin --delete ${{ env.BUILD_BRANCH }} - continue-on-error: true - - uses: mainmatter/continue-on-error-comment@v1 - with: - repo-token: ${{ github.token }} - outcome: ${{ steps.delete_build_branch.outcome }} - test-id: Error code ${{ matrix.code }} - - name: get build format branch name - run: | - firstString=${{ github.head_ref }} - secondString="format-" - echo ::set-env name=FORMAT_BRANCH::${firstString/develop-/"$secondString"} - - name: delete format branch - id: delete_format_branch - run: git push origin --delete ${{ env.FORMAT_BRANCH }} - continue-on-error: true - - uses: mainmatter/continue-on-error-comment@v1 - with: - repo-token: ${{ github.token }} - outcome: ${{ steps.delete_format_branch.outcome }} - test-id: Error code ${{ matrix.code }} - \ No newline at end of file diff --git a/.gitea/workflows/pr-reopened.yml b/.gitea/workflows/pr-reopened.yml new file mode 100644 index 0000000..3791720 --- /dev/null +++ b/.gitea/workflows/pr-reopened.yml @@ -0,0 +1,54 @@ +name: pr-open +run-name: ${{ github.actor }} is learning GitHub Actions +on: + pull_request: + types: + - reopened + branches: + - 'master' + +jobs: + build-branch: + runs-on: ubuntu-latest + steps: + # https://github.com/RouxAntoine/checkout/tree/v3.5.4 + - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 + with: + token: ${{ secrets.BOT_TOKEN }} + - uses: http://sigyl.com:3000/actions/setup-node@v3 + with: + node-version: '20' + - uses: http://sigyl.com:3000/actions/batch2yaml@master + with: + action: xml + path: '.' + - 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 + ./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 + - name: get build branch name + run: | + firstString=${{ github.ref_name }} + secondString="build-" + echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"} + - name: GIT commit and push all changed files + env: + CI_COMMIT_MESSAGE: Reopened PR copnverted to xml. + CI_COMMIT_AUTHOR: Continuous Integration + run: | + git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" + git config --global user.email "username@users.noreply.github.com" + git checkout -b ${{ env.BUILD_BRANCH }} + git add -A + git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} yml files converted to xml" + git push -f origin HEAD:${{ env.BUILD_BRANCH }} + + - 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 }})" + \ No newline at end of file