build/rebase-15 -> develop/rebase-15
This commit is contained in:
parent
d5fe756ffe
commit
c9e3295029
|
@ -61,7 +61,6 @@ jobs:
|
|||
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 branch -r
|
||||
git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
|
@ -73,7 +72,6 @@ jobs:
|
|||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git status
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
|
||||
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
|
||||
|
|
|
@ -45,7 +45,6 @@ jobs:
|
|||
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 branch -r
|
||||
git -C ../cloned checkout $BUILD_BRANCH || git -C ../cloned checkout -b $BUILD_BRANCH
|
||||
mv ../cloned/.git ..
|
||||
rm -rf ../cloned
|
||||
|
@ -57,7 +56,6 @@ jobs:
|
|||
rm -r .git
|
||||
mv ../cloned/* .
|
||||
mv ../cloned/.git .
|
||||
git status
|
||||
git add -A
|
||||
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
|
||||
git push origin HEAD:${{ env.BUILD_BRANCH }}
|
||||
|
|
Loading…
Reference in New Issue