Merge pull request 'hopefully will now work a branchs es are related' (#104) from develop-anewtest into master

Reviewed-on: #104

.gitea/workflows/convert-to-yml._ml

@@ -0,0 +1,116 @@
+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!!!"
+      

.gitea/workflows/convert-to-yml.yml

@@ -22,6 +22,7 @@ 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
@@ -42,6 +43,7 @@ jobs:
           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
@@ -53,20 +55,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 --allow-unrelated
-      #    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: make pull request
         #git fetch
         #  git merge origin/master --allow-unrelated-histories --strategy-option=ours