Merge pull request '....' (#130) from develop/ffffff into master

Reviewed-on: #130

.gitea/workflows/build->develop.myml

@@ -0,0 +1,42 @@
+name: convert-to-yml
+run-name: ${{ github.actor }} is learning GitHub Actions
+on:
+  push:
+    branches:
+      - 'build/**'
+jobs:
+  develop-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 }}
+          fetch-depth: '10'
+      - uses: http://sigyl.com:3000/actions/setup-node@v3
+        with:
+          node-version: '20'
+      - run: git fetch
+      - name: log
+        run: git log -10
+      - 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/build\//"$secondString"\/}
+      - name: GIT commit and push all changed files
+        env: 
+          CI_COMMIT_MESSAGE: converted to yml for review.
+          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 add -A
+          git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "
+          git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
+          git merge --squash ${{ github.ref_name }}
+          git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}

.gitea/workflows/develop -> build.yml

@@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is learning GitHub Actions
 on:
   push:
     branches:
-      - 'develop-**'
+      - 'develop/**'
 jobs:
   build-branch:
     runs-on: ubuntu-latest
@@ -12,6 +12,7 @@ jobs:
       - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
         with:
           token: ${{ secrets.BOT_TOKEN }}
+          fetch-depth: '10'
       - uses: http://sigyl.com:3000/actions/setup-node@v3
         with:
           node-version: '20'
@@ -24,13 +25,16 @@ jobs:
           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,index
           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
+          echo PR: $PR
+      - run: git fetch
       - name: get build branch name
         run: |
           firstString=${{ github.ref_name }}
-          secondString="build-"
-          echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"}
+          secondString="build"
+          echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
       - name: GIT commit and push all changed files
         env: 
           CI_COMMIT_MESSAGE: Development branch built to xml.
@@ -38,9 +42,10 @@ jobs:
         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 commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
+          git checkout -b ${{ env.BUILD_BRANCH }}
+          git merge --squash ${{ github.ref_name }}
           git push origin HEAD:${{ env.BUILD_BRANCH }}
 
       - name: make pull request comment

.gitea/workflows/format->develop.yml

@@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is learning GitHub Actions
 on:
   push:
     branches:
-      - 'format-**'
+      - 'format/**'
 jobs:
   develop-branch:
     runs-on: ubuntu-latest
@@ -12,6 +12,7 @@ jobs:
       - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
         with:
           token: ${{ secrets.BOT_TOKEN }}
+          fetch-depth: '10'
       - uses: http://sigyl.com:3000/actions/setup-node@v3
         with:
           node-version: '20'
@@ -22,8 +23,8 @@ jobs:
       - name: get development branch name
         run: |
           firstString=${{ github.ref_name }}
-          secondString="develop-"
-          echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format-/"$secondString"}
+          secondString="develop"
+          echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/}
       - name: clone
         run: |
           git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned          
@@ -47,7 +48,7 @@ jobs:
           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 commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "
           git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
       #- name: push development
       #  env: 

.gitea/workflows/pr-closed.yml

@@ -26,8 +26,8 @@ jobs:
       - name: get build branch name
         run: |
           firstString=${{ github.head_ref }}
-          secondString="build-"
-          echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"}      
+          secondString="build"
+          echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}s      
   if_merged:
     if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
@@ -44,8 +44,3 @@ jobs:
           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"}

.gitea/workflows/pr-reopened.yml

@@ -32,8 +32,8 @@ jobs:
       - name: get build branch name
         run: |
           firstString=${{ github.ref_name }}
-          secondString="build-"
-          echo ::set-env name=BUILD_BRANCH::${firstString/develop-/"$secondString"}
+          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.

.gitea/workflows/tag->deploy.yml

@@ -11,6 +11,7 @@ jobs:
       - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
         with:
           token: ${{ secrets.BOT_TOKEN }}
+          fetch-depth: '10'
       - name: ls
         run: ls
       - uses: actions/setup-node@v3
@@ -29,5 +30,5 @@ jobs:
           git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
           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 commit -a -m "${{ github.ref_name }} -> refs/heads/deployed/${{ github.ref_name }} "
           git push origin HEAD:refs/heads/deployed-${{ github.ref_name }}

instructions/equipment-model2.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...hhh....
+      - Description: Confirmation by the author of the recipe that it is ready forvfvfsxsxsxvf review.s...hhh....
     - RecipeApprovalStep:
       - Name: Review Recipe
       - Id: '-3'