Compare commits
3 Commits
88744c399b
...
a531c1debc
| Author | SHA1 | Date |
|---|---|---|
 batch-bot
|
a531c1debc | |
 giles
|
8396d9a537 | |
|
gilesb
|
e4e0b3317b |
|
|
@ -43,7 +43,7 @@ jobs:
|
||||||
- name: push
|
- name: push
|
||||||
run: |
|
run: |
|
||||||
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
|
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
|
||||||
git rebase origin/master --strategy-option ours --force-rebase
|
git rebase origin/master --strategy-option ours
|
||||||
git log -5
|
git log -5
|
||||||
echo no development branch so pushing
|
echo no development branch so pushing
|
||||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||||
|
|
@ -59,22 +59,21 @@ jobs:
|
||||||
echo 'pushed new branch and created pr';
|
echo 'pushed new branch and created pr';
|
||||||
else
|
else
|
||||||
if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
|
if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||||
git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }}
|
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||||
#git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
git -C ../cloned fetch origin #--depth=1
|
||||||
#git -C ../cloned fetch origin #--depth=1
|
git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
|
||||||
#git -C ../cloned checkout $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
|
rm -rf ../cloned/.git
|
||||||
#rm -rf ../cloned/.git
|
mv ../.git ../cloned
|
||||||
#mv ../.git ../cloned
|
mv .git/config ../cloned/.git
|
||||||
#mv .git/config ../cloned/.git
|
rm -r ./*
|
||||||
#rm -r ./*
|
rm -r .git
|
||||||
#rm -r .git
|
mv ../cloned/* .
|
||||||
#mv ../cloned/* .
|
mv ../cloned/.git .
|
||||||
#mv ../cloned/.git .
|
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 push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||||
else
|
else
|
||||||
echo 'no changes so no push'
|
echo 'no changes so no push'
|
||||||
|
|
|
||||||
|
|
@ -43,22 +43,21 @@ jobs:
|
||||||
git push origin HEAD:${{ env.BUILD_BRANCH }};
|
git push origin HEAD:${{ env.BUILD_BRANCH }};
|
||||||
else
|
else
|
||||||
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
|
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||||
git rebase -Xtheirs origin/${{ env.BUILD_BRANCH }}
|
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||||
#git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
git -C ../cloned fetch origin #--depth=1
|
||||||
#git -C ../cloned fetch origin #--depth=1
|
git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
|
||||||
#git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
|
mv ../cloned/.git ..
|
||||||
#mv ../cloned/.git ..
|
rm -rf ../cloned
|
||||||
#rm -rf ../cloned
|
cp -r . ../cloned
|
||||||
#cp -r . ../cloned
|
rm -rf ../cloned/.git
|
||||||
#rm -rf ../cloned/.git
|
mv ../.git ../cloned
|
||||||
#mv ../.git ../cloned
|
mv .git/config ../cloned/.git
|
||||||
#mv .git/config ../cloned/.git
|
rm -r ./*
|
||||||
#rm -r ./*
|
rm -r .git
|
||||||
#rm -r .git
|
mv ../cloned/* .
|
||||||
#mv ../cloned/* .
|
mv ../cloned/.git .
|
||||||
#mv ../cloned/.git .
|
git add -A
|
||||||
#git add -A
|
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
|
||||||
#git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
|
|
||||||
git push origin HEAD:${{ env.BUILD_BRANCH }}
|
git push origin HEAD:${{ env.BUILD_BRANCH }}
|
||||||
else
|
else
|
||||||
echo 'no changes so no push'
|
echo 'no changes so no push'
|
||||||
|
|
|
||||||
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