Compare commits

...

3 Commits

Author SHA1 Message Date
Continuous Integration e2ff7adb7a develop/hrereare -> build/hrereare
convert-to-yml / develop-branch (push) Failing after 26s Details
2023-10-23 08:30:19 +00:00
Continuous Integration 0f392d1cbf format/hrereare -> develop/hrereare
build-develop-branch / build-branch (push) Successful in 33s Details
build-develop-branch / delete (pull_request) Successful in 15s Details
build-develop-branch / if_merged (pull_request) Successful in 12s Details
2023-10-23 08:29:46 +00:00
giles 5a05cbf1d0 Merge pull request '.....' (#133) from develop/hrereare into master
Reviewed-on: #133
2023-10-23 08:28:20 +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