...
convert-built-to-yml / develop-branch (push) Failing after 20s Details

This commit is contained in:
giles 2023-10-22 23:47:58 +01:00
parent b247bc93fb
commit 358130ce41
1 changed files with 1 additions and 13 deletions

View File

@ -22,7 +22,7 @@ jobs:
- name: get development branch name - name: get development branch name
run: | run: |
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="development-" secondString="develop-"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build-/"$secondString"} echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build-/"$secondString"}
- name: GIT commit and push all changed files - name: GIT commit and push all changed files
env: env:
@ -49,15 +49,3 @@ jobs:
# converted from batch" # converted from batch"
# git merge origin/master --strategy-option=ours --allow-unrelated # git merge origin/master --strategy-option=ours --allow-unrelated
# git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} # git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
- name: make pull request
#git fetch
# git merge origin/master --allow-unrelated-histories --strategy-option=ours
# git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}
run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
chmod +x ./tea
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}
if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then
./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="development pull request" -t="WIP: ${{ github.event.head_commit.message }}"
fi
rm ./tea