more theres
convert-to-yml / develop-branch (push) Successful in 33s
Details
convert-to-yml / develop-branch (push) Successful in 33s
Details
This commit is contained in:
parent
42f52ee099
commit
cbc991fc48
|
@ -61,21 +61,22 @@ jobs:
|
|||
echo 'pushed new branch and created pr';
|
||||
else
|
||||
if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
git -C ../cloned fetch origin #--depth=1
|
||||
git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
rm -rf ../cloned/.git
|
||||
mv ../.git ../cloned
|
||||
mv .git/config ../cloned/.git
|
||||
rm -r ./*
|
||||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
|
||||
git rebase -Xtheirs origin/${{ env.DEVELOPMENT_BRANCH }}
|
||||
#git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
#git -C ../cloned fetch origin #--depth=1
|
||||
#git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
|
||||
#mv ../cloned/.git ..
|
||||
#rm -rf ../cloned
|
||||
#cp -r . ../cloned
|
||||
#rm -rf ../cloned/.git
|
||||
#mv ../.git ../cloned
|
||||
#mv .git/config ../cloned/.git
|
||||
#rm -r ./*
|
||||
#rm -r .git
|
||||
#mv ../cloned/* .
|
||||
#mv ../cloned/.git .
|
||||
#git add -A
|
||||
#git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
|
||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||
else
|
||||
echo 'no changes so no push'
|
||||
|
|
|
@ -43,21 +43,22 @@ jobs:
|
|||
git push origin HEAD:${{ env.BUILD_BRANCH }};
|
||||
else
|
||||
if [[ $(git diff origin/${{ env.BUILD_BRANCH }} | wc -c) -ne 0 ]]; then
|
||||
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
git -C ../cloned fetch origin #--depth=1
|
||||
git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
cp -r . ../cloned
|
||||
rm -rf ../cloned/.git
|
||||
mv ../.git ../cloned
|
||||
mv .git/config ../cloned/.git
|
||||
rm -r ./*
|
||||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
|
||||
git rebase -Xtheirs origin/${{ env.BUILD_BRANCH }}
|
||||
#git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
|
||||
#git -C ../cloned fetch origin #--depth=1
|
||||
#git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
|
||||
#mv ../cloned/.git ..
|
||||
#rm -rf ../cloned
|
||||
#cp -r . ../cloned
|
||||
#rm -rf ../cloned/.git
|
||||
#mv ../.git ../cloned
|
||||
#mv .git/config ../cloned/.git
|
||||
#rm -r ./*
|
||||
#rm -r .git
|
||||
#mv ../cloned/* .
|
||||
#mv ../cloned/.git .
|
||||
#git add -A
|
||||
#git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
|
||||
git push origin HEAD:${{ env.BUILD_BRANCH }}
|
||||
else
|
||||
echo 'no changes so no push'
|
||||
|
|
Loading…
Reference in New Issue