more
build-develop-branch / build-branch (push) Has been skipped Details
convert-to-yml / develop-branch (push) Failing after 27s Details

This commit is contained in:
giles 2023-10-22 00:35:40 +01:00
parent 0f164de0b8
commit 23b23432b5
1 changed files with 3 additions and 0 deletions

View File

@ -34,6 +34,9 @@ jobs:
git add -A git add -A
git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }} git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }}
git fetch
git merge origin/master --allow-unrelated-histories
git push origin HEAD:${{ env.PRODUCTION_BRANCH }}
- name: make pull request - name: make pull request
run: | run: |
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