Compare commits

...

26 Commits

Author SHA1 Message Date
giles 1d018df80a runna diff on build and development
convert-to-yml / develop-branch (push) Successful in 28s Details
2023-10-23 09:29:19 +01:00
giles a1277e15ed Merge remote-tracking branch 'origin/build/hrereare' into format/hrereare
convert-to-yml / develop-branch (push) Successful in 27s Details
2023-10-23 03:38:58 +01:00
Continuous Integration ac0ae123d8 develop/hrereare -> build/hrereare 2023-10-23 02:37:46 +00:00
giles f77b9bfc2f Merge remote-tracking branch 'origin/build/hrereare' into format/hrereare
convert-to-yml / develop-branch (push) Failing after 29s Details
2023-10-23 03:35:22 +01:00
Continuous Integration 1b57edca8d develop/hrereare -> build/hrereare 2023-10-23 02:25:38 +00:00
giles 82aaa6525f .....
convert-to-yml / develop-branch (push) Successful in 28s Details
2023-10-23 03:24:41 +01:00
giles 3b0cc35641 .....
convert-to-yml / develop-branch (push) Successful in 27s Details
2023-10-23 03:21:20 +01:00
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
5 changed files with 5 additions and 2193 deletions

View File

@ -28,7 +28,7 @@ jobs:
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="develop" secondString="develop"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/} echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/}
- name: GIT commit and push all changed files - name: GIT commit diff
env: env:
CI_COMMIT_MESSAGE: converted to yml for review. CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration CI_COMMIT_AUTHOR: Continuous Integration
@ -36,7 +36,5 @@ jobs:
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 add -A git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
git checkout -b ${{ env.DEVELOPMENT_BRANCH }} ggit diff HEAD origin/${{ env.DEVELOPMENT_BRANCH }}
git merge --squash ${{ github.ref_name }}
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}

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