rebase27

Reviewed-on: #177

.gitea/workflows/build->develop.yml

@@ -43,24 +43,10 @@ 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
+            ls
-            git -C ../cloned fetch origin #--depth=1
+            git rebase -Xours origin/master
-            git -C ../cloned branch -r
+            ls
-            git -C ../cloned checkout master || git -C ../cloned checkout -b master
+            git log -5
-            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;
@@ -75,9 +61,9 @@ jobs:
             echo 'pushed new branch and created pr';
           else
             if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
+              #git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }}
               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
@@ -89,7 +75,6 @@ jobs:
               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 }};

.gitea/workflows/develop -> build.yml

@@ -32,16 +32,20 @@ jobs:
           firstString=${{ github.ref_name }}
           secondString="build"
           echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
+      - name: status
+        run: |
+          ls
       - name: push
         run: |
           git add -A
           git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
-          git checkout -b ${{ env.BUILD_BRANCH }}
+          if [[ $(git branch -r | grep -Fx "  origin/${{ env.BUILD_BRANCH }}" | wc -c) -eq 0 ]]; then
-          git merge --squash ${{ github.ref_name }}
+            git push origin HEAD:${{ env.BUILD_BRANCH }};
+          else
             if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
+              #git rebase -Xtheirs origin/${{ env.BUILD_BRANCH }}
               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
@@ -53,19 +57,20 @@ jobs:
               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 grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then
+          ./tea pr ls -f=base,head -o=csv
+          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 }})

.gitea/workflows/format->develop.yml

@@ -1,81 +0,0 @@
-name: convert-to-yml
-run-name: ${{ github.actor }} is learning GitHub Actions
-on:
-  push:
-    branches:
-      - 'format/**'
-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'
-      - 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"\/}
-          git status
-      - name: clone
-        run: |
-          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 .
-      - 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 status
-          git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "
-          git push 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.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
-          rm ./tea

.gitea/workflows/pr-closed.yml

@@ -36,6 +36,8 @@ jobs:
       - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
         with:
           token: ${{ secrets.BOT_TOKEN }}
+      - name: tag
+        run: git tag
       - name: delete develop branch
         id: delete_develop_branch
         run: git push origin --delete ${{ github.head_ref }}