develop/tryagain -> build/tryagain

format/tryagain -> develop/tryagain
2023-10-23 02:04:02 +00:00 · 2023-10-23 02:03:33 +00:00 · 2023-10-23 02:00:59 +00:00 · 2023-10-23 01:55:34 +00:00 · 2023-10-23 01:54:18 +00:00 · 2023-10-23 01:52:57 +00:00
4 changed files with 6 additions and 4 deletions
--- a/.gitea/workflows/develop
+++ b/.gitea/workflows/develop
@ -46,7 +46,7 @@ jobs:
          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 }}
+          git push -f origin HEAD:${{ env.BUILD_BRANCH }}

      - name: make pull request comment
        run: |
--- a/.gitea/workflows/format->develop.yml
+++ b/.gitea/workflows/format->develop.yml
@ -29,7 +29,9 @@ jobs:
      - name: clone
        run: |
          git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
-          git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
+          git -C ../cloned fetch origin #--depth=1
+          git -C ../cloned branch -r
+          git -C ../cloned switch $DEVELOPMENT_BRANCH
          mv ../cloned/.git ..
          rm -rf ../cloned
          cp -r . ../cloned
--- a/equipment-model.axml
+++ b/equipment-model.axml
--- a/instructions/equipment-model2.axml
+++ b/instructions/equipment-model2.axml
Author	SHA1	Message	Date
Continuous Integration	f12b68c0c6	develop/tryagain -> build/tryagain	2023-10-23 02:04:02 +00:00
Continuous Integration	4cc3e0bc04	format/tryagain -> develop/tryagain build-develop-branch / build-branch (push) Successful in 29s Details build-develop-branch / delete (pull_request) Successful in 13s Details build-develop-branch / if_merged (pull_request) Successful in 11s Details	2023-10-23 02:03:33 +00:00
Continuous Integration	80dd8ec1d2	format/tryagain -> develop/tryagain build-develop-branch / build-branch (push) Failing after 23s Details	2023-10-23 02:00:59 +00:00
Continuous Integration	d3babdad01	format/tryagain -> develop/tryagain build-develop-branch / build-branch (push) Failing after 25s Details	2023-10-23 01:55:34 +00:00
Continuous Integration	665cd9242b	format/tryagain -> develop/tryagain build-develop-branch / build-branch (push) Failing after 26s Details	2023-10-23 01:54:18 +00:00
Continuous Integration	994a9c414a	format/tryagain -> develop/tryagain build-develop-branch / build-branch (push) Failing after 25s Details	2023-10-23 01:52:57 +00:00