Compare commits

..

4 Commits

Author SHA1 Message Date
Continuous Integration 15a9696d4c build/16 -> develop/16
build-develop-branch / build-branch (push) Failing after 29s Details
2023-10-23 11:06:52 +00:00
giles 3555ddf195 lllllllll
convert-to-yml / develop-branch (push) Failing after 30s Details
2023-10-23 12:06:27 +01:00
giles 8633b3478c lllllllll
convert-to-yml / develop-branch (push) Failing after 28s Details
2023-10-23 12:04:19 +01:00
giles 874fbab8ab lllllllll
convert-to-yml / develop-branch (push) Failing after 40s Details
2023-10-23 12:01:48 +01:00
2 changed files with 3 additions and 3 deletions

View File

@ -49,7 +49,8 @@ jobs:
CI_COMMIT_AUTHOR: Continuous Integration CI_COMMIT_AUTHOR: Continuous Integration
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 push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; echo no development branch so pushing
git push origin -f HEAD:${{ env.DEVELOPMENT_BRANCH }};
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea; curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
chmod +x ./tea; chmod +x ./tea;
./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 }};
@ -59,7 +60,7 @@ 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 origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
else else
echo 'no changes so no push' echo 'no changes so no push'
fi; fi;

View File

@ -27,7 +27,6 @@ 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