Compare commits

...

4 Commits

Author SHA1 Message Date
giles 442079f082 .....
convert-to-yml / develop-branch (push) Successful in 35s Details
2023-10-23 12:26:38 +01:00
giles 03eef70058 .....
convert-to-yml / develop-branch (push) Successful in 32s Details
2023-10-23 12:21:25 +01:00
giles fdfacb713d .....
convert-to-yml / develop-branch (push) Successful in 32s Details
2023-10-23 12:18:10 +01:00
giles ef69397ae4 .....
convert-to-yml / develop-branch (push) Successful in 31s Details
2023-10-23 12:16:51 +01:00
2 changed files with 40 additions and 4 deletions

View File

@ -61,7 +61,24 @@ 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 push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; 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
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 status
git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
else else
echo 'no changes so no push' echo 'no changes so no push'
fi; fi;

View File

@ -27,6 +27,7 @@ jobs:
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
pr=$(./tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1) pr=$(./tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1)
export PR="${pr//[\"\'\`]/}" export PR="${pr//[\"\'\`]/}"
echo ::set-env name=PR::$PR
rm ./tea rm ./tea
- run: git fetch - run: git fetch
- name: get build branch name - name: get build branch name
@ -46,7 +47,25 @@ jobs:
git checkout -b ${{ env.BUILD_BRANCH }} git checkout -b ${{ env.BUILD_BRANCH }}
git merge --squash ${{ github.ref_name }} git merge --squash ${{ github.ref_name }}
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 push -f origin HEAD:${{ env.BUILD_BRANCH }}
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
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 status
git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
git push origin HEAD:${{ env.BUILD_BRANCH }}
else else
echo 'no changes so no push' echo 'no changes so no push'
fi; fi;