another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

Merge pull request 'more' (#77) from develop-7 into master
build-develop-branch / build-branch (push) Has been skipped Details
Bump version / build (push) Failing after 12s Details
convert-to-xml / format-branch (push) Successful in 22s Details
convert-to-yml / develop-branch (push) Has been skipped Details 

Reviewed-on: #77
This commit is contained in:
giles 2023-10-21 23:39:21 +00:00
parent 48ee0bad02 0fd82df2be
commit 77e5f39021
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitea/workflows/convert-to-yml.yml
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 --strategy-option=ours
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