Compare commits
3 Commits
e5c8558fa1
...
e2ff7adb7a
Author | SHA1 | Date |
---|---|---|
Continuous Integration | e2ff7adb7a | |
Continuous Integration | 0f392d1cbf | |
giles | 5a05cbf1d0 |
|
@ -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 }}
|
|
Loading…
Reference in New Issue