Compare commits
19 Commits
master
...
format/now
Author | SHA1 | Date |
---|---|---|
giles | 31aa516eec | |
giles | a453e3e338 | |
giles | 2bbff49e2f | |
giles | 9a252762b3 | |
giles | fdbfb48917 | |
giles | 379544ee06 | |
giles | a41cf5f4b0 | |
giles | d89c5f74c3 | |
giles | bf9ef6ca58 | |
giles | 1d780c8966 | |
giles | b5b5a4c5bb | |
giles | d965c14fea | |
giles | 625fbfb5e7 | |
giles | 2d3f8fa2f2 | |
giles | a4b02e3aad | |
giles | a4e8ad5d66 | |
giles | 7fe4ab4def | |
giles | 619467527a | |
Continuous Integration | 2dd5378e5a |
|
@ -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: |
|
||||
|
|
|
@ -25,9 +25,13 @@ jobs:
|
|||
firstString=${{ github.ref_name }}
|
||||
secondString="develop"
|
||||
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/}
|
||||
git status
|
||||
- name: clone
|
||||
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 ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
|
@ -45,7 +49,6 @@ jobs:
|
|||
run: |
|
||||
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
|
||||
git config --global user.email "username@users.noreply.github.com"
|
||||
git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
|
||||
git add -A
|
||||
git status
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "
|
||||
|
|
|
@ -31,4 +31,4 @@ jobs:
|
|||
git config --global user.email "username@users.noreply.github.com"
|
||||
git add -A
|
||||
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
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
Loading…
Reference in New Issue