build/rebase-10 -> develop/rebase-10

.....
2023-10-23 14:56:18 +00:00 · 2023-10-23 14:56:18 +00:00 · 2023-10-23 15:55:15 +01:00 · 2023-10-23 15:52:13 +01:00 · 2023-10-23 15:49:53 +01:00 · 2023-10-23 15:47:41 +01:00
5 changed files with 207 additions and 42 deletions
--- a/.gitea/workflows/build->develop
+++ b/.gitea/workflows/build->develop
@ -0,0 +1,99 @@
+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
+      - env: env
+        run: printenv
+      - 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: config
+        run: |
+          git config --global user.name "${{ github.actor }}"
+          git config --global user.email "${{ github.event.pusher.email }}"
+      - name: commit
+        run: |
+          git add -A
+          git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
+      - name: status
+        run: |
+          git branch -r
+          echo $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c)
+      - name: push
+        run: |
+          if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
+            git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
+            git -C ../cloned fetch origin #--depth=1
+            git -C ../cloned branch -r
+            git -C ../cloned checkout master || git -C ../cloned checkout -b master
+            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 .
+            git status
+            git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
+            git add -A
+            git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
+            echo no development branch so pushing
+            git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
+            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 }};
+            if [[ $(./tea pr ls -f=base,head -o=csv | grep 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 
+            this PR is instigated by and will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})
+              " -t="WIP: ${{ github.event.head_commit.message }}"
+            fi
+            echo 'pushed new branch and created pr';
+          else
+            if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
+              git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
+              git -C ../cloned fetch origin #--depth=1
+              git -C ../cloned branch -r
+              git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
+              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 .
+              git status
+              git add -A
+              git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
+              git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
+            else
+              echo 'no changes so no push'
+            fi;
+          fi
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@ -43,24 +43,7 @@ jobs:
      - name: push
        run: |
          if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
-            git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
-            git -C ../cloned fetch origin #--depth=1
-            git -C ../cloned branch -r
-            git -C ../cloned checkout master || git -C ../cloned checkout -b master
-            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 .
-            git status
-            git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
-            git add -A
-            git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
+            git rebase origin/master
            echo no development branch so pushing
            git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
            curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
--- a/.gitea/workflows/develop
+++ b/.gitea/workflows/develop
@ -0,0 +1,93 @@
+name: build-develop-branch
+run-name: ${{ github.actor }} is learning GitHub Actions
+on:
+  push:
+    branches:
+      - 'develop/**'
+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 }}
+          fetch-depth: '10'
+      - env: env
+        run: printenv
+      - 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: '.'
+      - run: git fetch
+      - name: config
+        run: |
+          git config --global user.name "${{ github.actor }}"
+          git config --global user.email "${{ github.event.pusher.email }}"
+      - name: get build branch name
+        run: |
+          firstString=${{ github.ref_name }}
+          secondString="build"
+          echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
+      - name: status
+        run: |
+          git branch -r
+          echo $(git branch -r | grep -Fx "  origin/${{ env.BUILD_BRANCH }}" | wc -c)
+      - name: push
+        run: |
+          git add -A
+          git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
+          if [[ $(git branch -r | grep -Fx "  origin/${{ env.BUILD_BRANCH }}" | wc -c) -eq 0 ]]; then
+            git push origin HEAD:${{ env.BUILD_BRANCH }};
+          else
+            if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
+              git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
+              git -C ../cloned fetch origin #--depth=1
+              git -C ../cloned branch -r
+              git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
+              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 .
+              git status
+              git add -A
+              git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
+              git push origin HEAD:${{ env.BUILD_BRANCH }}
+            else
+              echo 'no changes so no push'
+            fi;
+          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 }}
+          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="
+          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)
+          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 }})"
+          
--- a/.gitea/workflows/develop
+++ b/.gitea/workflows/develop
@ -32,40 +32,30 @@ jobs:
          firstString=${{ github.ref_name }}
          secondString="build"
          echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
+      - name: status
+        run: |
+          git branch -r
+          echo $(git branch -r | grep -Fx "  origin/${{ env.BUILD_BRANCH }}" | wc -c)
      - name: push
        run: |
          git add -A
          git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
-          git checkout -b ${{ env.BUILD_BRANCH }}
-          git merge --squash ${{ github.ref_name }}
-          if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
-            git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
-            git -C ../cloned fetch origin #--depth=1
-            git -C ../cloned branch -r
-            git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
-            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 .
-            git status
-            git add -A
-            git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
-            git push origin HEAD:${{ env.BUILD_BRANCH }}
+          if [[ $(git branch -r | grep -Fx "  origin/${{ env.BUILD_BRANCH }}" | wc -c) -eq 0 ]]; then
+            git push origin HEAD:${{ env.BUILD_BRANCH }};
          else
-            echo 'no changes so no push'
+            if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
+              git rebase origin/${{ env.BUILD_BRANCH }}
+              git push origin HEAD:${{ env.BUILD_BRANCH }}
+            else
+              echo 'no changes so no push'
+            fi;
          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 }}
-          if [[ $(./tea pr ls -f=base,head -o=csv | grep grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then
+          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="
          development pull request 
          this PR is will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})
--- a/equipment-model.a.yml
+++ b/equipment-model.a.yml
@ -21,7 +21,7 @@
    - Type: '0'
  - EnumerationSet:
    - UniqueName: $TIMER_TYPE
-    - Type: '1'
+    - Type: '13'
    - Member:
      - Name: COUNT_DOWN
      - Ordinal: '0'
Author	SHA1	Message	Date
giles	3829b938aa	build/rebase-10 -> develop/rebase-10 convert-to-yml / develop-branch (push) Failing after 25s Details	2023-10-23 14:56:18 +00:00
gilesb	12b0b16cfc	.....	2023-10-23 14:56:18 +00:00
gilesb	c3fe2f2f3a	..... convert-to-yml / develop-branch (push) Successful in 32s Details	2023-10-23 15:55:15 +01:00
gilesb	d075821c45	..... convert-to-yml / develop-branch (push) Successful in 33s Details	2023-10-23 15:52:13 +01:00
gilesb	b2f8610a03	..... convert-to-yml / develop-branch (push) Failing after 29s Details	2023-10-23 15:49:53 +01:00
gilesb	fd8c22de42	... convert-to-yml / develop-branch (push) Successful in 32s Details	2023-10-23 15:47:41 +01:00
gilesb	b96c610f18	... convert-to-yml / develop-branch (push) Successful in 43s Details	2023-10-23 15:44:29 +01:00
gilesb	595f0012bb	... convert-to-yml / develop-branch (push) Successful in 32s Details	2023-10-23 15:30:37 +01:00
gilesb	9e7382ba53	....... convert-to-yml / develop-branch (push) Successful in 33s Details	2023-10-23 15:24:40 +01:00
gilesb	159c8df63c	..... convert-to-yml / develop-branch (push) Successful in 31s Details	2023-10-23 15:22:37 +01:00
gilesb	990b7192b2	..... convert-to-yml / develop-branch (push) Failing after 28s Details	2023-10-23 15:18:55 +01:00
giles	ae922d09c4	develop/rebase -> build/rebase convert-to-yml / develop-branch (push) Failing after 28s Details	2023-10-23 14:16:50 +00:00
gilesb	fa367d43d9	..... build-develop-branch / build-branch (push) Successful in 36s Details build-develop-branch / delete (pull_request) Successful in 14s Details build-develop-branch / if_merged (pull_request) Has been skipped Details	2023-10-23 15:16:12 +01:00
gilesb	399dc461c3	... build-develop-branch / build-branch (push) Successful in 35s Details build-develop-branch / delete (pull_request) Successful in 18s Details build-develop-branch / if_merged (pull_request) Has been skipped Details	2023-10-23 15:11:39 +01:00
gilesb	ee7bed8c18	... build-develop-branch / build-branch (push) Successful in 37s Details	2023-10-23 15:08:10 +01:00
gilesb	20088da9bb	... build-develop-branch / build-branch (push) Failing after 30s Details	2023-10-23 15:06:04 +01:00
gilesb	589acdaee4	... build-develop-branch / build-branch (push) Failing after 28s Details	2023-10-23 15:04:45 +01:00
gilesb	2c7937596c	..... build-develop-branch / build-branch (push) Has been cancelled Details	2023-10-23 15:02:28 +01:00
gilesb	eda88259de	..... build-develop-branch / build-branch (push) Failing after 30s Details	2023-10-23 14:55:47 +01:00
gilesb	836c1edfef	.... build-develop-branch / build-branch (push) Successful in 39s Details	2023-10-23 14:52:06 +01:00