Compare commits

...

19 Commits

Author SHA1 Message Date
giles 31aa516eec .........
convert-to-yml / develop-branch (push) Failing after 24s Details
2023-10-23 03:14:45 +01:00
giles a453e3e338 kkkkkwssssssssssssssssssss
convert-to-yml / develop-branch (push) Successful in 27s Details
2023-10-23 03:13:03 +01:00
giles 2bbff49e2f kkkkk
convert-to-yml / develop-branch (push) Successful in 26s Details
2023-10-23 03:11:11 +01:00
giles 9a252762b3 kkkkk
convert-to-yml / develop-branch (push) Failing after 19s Details
2023-10-23 03:05:20 +01:00
giles fdbfb48917 llllllllllllll
convert-to-yml / develop-branch (push) Successful in 26s Details
2023-10-23 03:03:11 +01:00
giles 379544ee06 llllllllllllll
convert-to-yml / develop-branch (push) Successful in 26s Details
2023-10-23 03:00:37 +01:00
giles a41cf5f4b0 llllllllllllll
convert-to-yml / develop-branch (push) Failing after 23s Details
2023-10-23 02:58:02 +01:00
giles d89c5f74c3 llllllllllllll
convert-to-yml / develop-branch (push) Failing after 21s Details
2023-10-23 02:56:32 +01:00
giles bf9ef6ca58 llllllllllllll
convert-to-yml / develop-branch (push) Successful in 27s Details
2023-10-23 02:55:09 +01:00
giles 1d780c8966 llllllllllllll
convert-to-yml / develop-branch (push) Successful in 26s Details
2023-10-23 02:53:55 +01:00
giles b5b5a4c5bb llllllllllllll
convert-to-yml / develop-branch (push) Successful in 25s Details
2023-10-23 02:52:35 +01:00
giles d965c14fea llllllllllllll
convert-to-yml / develop-branch (push) Failing after 24s Details
2023-10-23 02:51:06 +01:00
giles 625fbfb5e7 llllllllllllll
convert-to-yml / develop-branch (push) Failing after 24s Details
2023-10-23 02:49:26 +01:00
giles 2d3f8fa2f2 llllllllllllll
convert-to-yml / develop-branch (push) Failing after 25s Details
2023-10-23 02:46:41 +01:00
giles a4b02e3aad llllllllllllll
convert-to-yml / develop-branch (push) Successful in 30s Details
2023-10-23 02:45:50 +01:00
giles a4e8ad5d66 llllllllllllll
convert-to-yml / develop-branch (push) Failing after 25s Details
2023-10-23 02:38:51 +01:00
giles 7fe4ab4def llllllllllllll
convert-to-yml / develop-branch (push) Failing after 21s Details
2023-10-23 02:36:28 +01:00
giles 619467527a llllllllllllll
convert-to-yml / develop-branch (push) Failing after 21s Details
2023-10-23 02:35:31 +01:00
Continuous Integration 2dd5378e5a v013 -> refs/heads/deployed/v013 2023-10-23 01:31:27 +00:00
8 changed files with 9 additions and 2192 deletions

View File

@ -46,7 +46,7 @@ jobs:
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
git checkout -b ${{ env.BUILD_BRANCH }} git checkout -b ${{ env.BUILD_BRANCH }}
git merge --squash ${{ github.ref_name }} 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 - name: make pull request comment
run: | run: |

View File

@ -25,9 +25,13 @@ jobs:
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="develop" secondString="develop"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/} echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/}
git status
- name: clone - name: clone
run: | run: |
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
git -C ../cloned fetch origin #--depth=1
git -C ../cloned branch -r
git -C ../cloned switch $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
mv ../cloned/.git .. mv ../cloned/.git ..
rm -rf ../cloned rm -rf ../cloned
cp -r . ../cloned cp -r . ../cloned
@ -45,7 +49,6 @@ jobs:
run: | run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com" git config --global user.email "username@users.noreply.github.com"
git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
git add -A git add -A
git status git status
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "

View File

@ -31,4 +31,4 @@ jobs:
git config --global user.email "username@users.noreply.github.com" git config --global user.email "username@users.noreply.github.com"
git add -A git add -A
git commit -a -m "${{ github.ref_name }} -> refs/heads/deployed/${{ github.ref_name }} " git commit -a -m "${{ github.ref_name }} -> refs/heads/deployed/${{ github.ref_name }} "
git push origin HEAD:refs/heads/deployed-${{ github.ref_name }} git push origin HEAD:refs/heads/deployed/${{ github.ref_name }}

File diff suppressed because it is too large Load Diff

1
equipment-model.axml Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long