build/16 -> develop/16

.....
2023-10-23 11:12:14 +00:00 · 2023-10-23 12:11:43 +01:00
1 changed files with 3 additions and 3 deletions
--- a/.gitea/workflows/build->develop.yml
+++ b/.gitea/workflows/build->develop.yml
@ -43,15 +43,15 @@ jobs:
          CI_COMMIT_AUTHOR: Continuous Integration
        run: |
          git branch -r
-          echo $(git branch -r | grep -Fx origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c)
+          echo $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c)
      - name: diff
        env: 
          CI_COMMIT_MESSAGE: converted to yml for review.
          CI_COMMIT_AUTHOR: Continuous Integration
        run: |
-          if [[ $(git branch -r | grep -Fx origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -eq 0 ]]; then
+          if [[ $(git branch -r | grep -Fx "  origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
            echo no development branch so pushing
-            git push origin -f HEAD:${{ env.DEVELOPMENT_BRANCH }};
+            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 }};
Author	SHA1	Message	Date
Continuous Integration	df332564de	build/16 -> develop/16 build-develop-branch / build-branch (push) Failing after 27s Details	2023-10-23 11:12:14 +00:00
giles	6d9ff43810	..... convert-to-yml / develop-branch (push) Successful in 31s Details	2023-10-23 12:11:43 +01:00