diff --git a/.gitea/workflows/build-develop-branch.yml b/.gitea/workflows/build-develop-branch.yml index 3af8ed6..901ff1e 100644 --- a/.gitea/workflows/build-develop-branch.yml +++ b/.gitea/workflows/build-develop-branch.yml @@ -2,9 +2,10 @@ name: build-develop-branch run-name: ${{ github.actor }} is learning GitHub Actions on: push: + branches: + - 'develop-**' jobs: build-branch: - if: ${{ startsWith(github.ref_name, 'develop-') }} runs-on: ubuntu-latest steps: # https://github.com/RouxAntoine/checkout/tree/v3.5.4 @@ -20,7 +21,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=${{ secrets.TEA_TOKEN }} + ./tea login add -n=this --url=${{ github.server_url}} -t=${{ github.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 @@ -37,12 +38,12 @@ jobs: 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 }} ym files converted to xml" - git push -f origin HEAD:${{ env.BUILD_BRANCH }} + 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 "ohhhh i see!!!" + ./tea c $PR "this branch has been built on [${{ env.BUILD_BRANCH }}](https://sigyl.com/git/another-user/batch-example/src/branch/build-yet-another)" \ No newline at end of file diff --git a/.gitea/workflows/convert-to-xml.yml b/.gitea/workflows/convert-to-xml.yml index 82f921f..df73c83 100644 --- a/.gitea/workflows/convert-to-xml.yml +++ b/.gitea/workflows/convert-to-xml.yml @@ -28,4 +28,4 @@ jobs: git config --global user.email "username@users.noreply.github.com" git add -A git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} yml files converted to xml" - git push -f origin HEAD:refs/heads/deployed-${{ github.ref_name }} + -f origin HEAD:refs/heads/deployed-${{ github.ref_name }} diff --git a/.gitea/workflows/convert-to-yml._ml b/.gitea/workflows/convert-to-yml._ml deleted file mode 100644 index 7a8f3b0..0000000 --- a/.gitea/workflows/convert-to-yml._ml +++ /dev/null @@ -1,116 +0,0 @@ -name: convert-to-yml -run-name: ${{ github.actor }} is learning GitHub Actions -on: - push: -jobs: - develop-branch: - if: ${{ startsWith(github.ref_name, 'format-') }} - runs-on: ubuntu-latest - steps: - # https://github.com/RouxAntoine/checkout/tree/v3.5.4 - - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 - - uses: http://sigyl.com:3000/actions/setup-node@v3 - with: - node-version: '20' - - uses: http://sigyl.com:3000/actions/batch2yaml@master - with: - action: yml - path: '.' - - name: get development branch name - run: | - firstString=${{ github.ref_name }} - secondString="develop-" - 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 - mv ../cloned/.git .. - rm -rf ../cloned - cp -r . ../cloned - rm -rf ../cloned/.git - mv ../.git ../cloned - mv .git/config ../cloned/.git - rm -r ./* - 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_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.DEVELOPMENT_BRANCH }} - git add -A - git status - git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" - git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - #- name: push development - # env: - # CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts - # 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 fetch --depth=1 - # git add -A - # git commit -m "${{ env.CI_COMMIT_MESSAGE }} - # - # converted from batch" - # git merge origin/master --strategy-option=ours --allow-unrelated - # git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - - name: make pull request - #git fetch - # git merge origin/master --allow-unrelated-histories --strategy-option=ours - # git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - 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.TEA_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 - rm ./tea - - uses: http://sigyl.com:3000/actions/batch2yaml@master - name: back to xml - 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 - echo ::set-env name=PR::$(./tea pr ls -f=base,head,index | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1) - echo $PR - rm ./tea - - name: get build branch name - run: | - firstString=${{ github.ref_name }} - secondString="build-" - echo ::set-env name=BUILD_BRANCH::${firstString/format-/"$secondString"} - - name: GIT commit and push all changes - env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts - 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 }} ym 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 "ohhhh i see!!!" - \ No newline at end of file diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index 7d281f1..0baa48e 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -2,9 +2,10 @@ name: convert-to-yml run-name: ${{ github.actor }} is learning GitHub Actions on: push: + branches: + - 'format-**' jobs: develop-branch: - if: ${{ startsWith(github.ref_name, 'format-') }} runs-on: ubuntu-latest steps: # https://github.com/RouxAntoine/checkout/tree/v3.5.4 @@ -22,7 +23,6 @@ jobs: secondString="develop-" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format-/"$secondString"} - name: clone - if: ${{ startsWith(github.ref_name, 'notformat-') }} run: | git remote -v git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned @@ -39,11 +39,9 @@ jobs: rm -r .git mv ../cloned/* . mv ../cloned/.git . - ls -la git status - name: GIT commit and push all changed files - if: ${{ startsWith(github.ref_name, 'notformat-') }} env: CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts CI_COMMIT_AUTHOR: Continuous Integration @@ -55,20 +53,20 @@ jobs: git status git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - - name: push development - env: - CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts - 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 fetch --depth=1 - git add -A - git commit -m "${{ env.CI_COMMIT_MESSAGE }} - - converted from batch" - # git merge origin/master --strategy-option=ours - git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} + #- name: push development + # env: + # CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + # 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 fetch --depth=1 + # git add -A + # git commit -m "${{ env.CI_COMMIT_MESSAGE }} + # + # converted from batch" + # git merge origin/master --strategy-option=ours --allow-unrelated + # git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - name: make pull request #git fetch # git merge origin/master --allow-unrelated-histories --strategy-option=ours @@ -76,7 +74,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=${{ secrets.TEA_TOKEN }} + ./tea login add -n=this --url=${{ github.server_url}} -t=${{ github.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 @@ -114,5 +112,5 @@ jobs: run: | curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea chmod +x ./tea - ./tea c $PR "ohhhh i see!!!" + ./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 41cd10e..488c2d7 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -25,7 +25,7 @@ jobs: continue-on-error: true - uses: mainmatter/continue-on-error-comment@v1 with: - repo-token: ${{ secrets.TEA_TOKEN }} + repo-token: ${{ github.token }} outcome: ${{ steps.delete_develop_branch.outcome }} test-id: Error code ${{ matrix.code }} - name: get build branch name @@ -39,7 +39,7 @@ jobs: continue-on-error: true - uses: mainmatter/continue-on-error-comment@v1 with: - repo-token: ${{ secrets.TEA_TOKEN }} + repo-token: ${{ github.token }} outcome: ${{ steps.delete_build_branch.outcome }} test-id: Error code ${{ matrix.code }} - name: get build format branch name @@ -53,7 +53,7 @@ jobs: continue-on-error: true - uses: mainmatter/continue-on-error-comment@v1 with: - repo-token: ${{ secrets.TEA_TOKEN }} + 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/equipment-model.a.yml b/equipment-model.a.yml index 2ba9693..11cbe7a 100644 --- a/equipment-model.a.yml +++ b/equipment-model.a.yml @@ -135,7 +135,7 @@ - Required: '0' - ApproveSignatureTemplateName: null - RevertSignatureTemplateName: null - - Description: Confirmation by the author of the recipe that it is ready for review.s...gfhhh.... + - Description: Confirmation by the author of the recipe that it is ready for redcdview.s...gfhhh.... - RecipeApprovalStep: - Name: Review Recipe - Id: '-3'