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

more
build-develop-branch / build-branch (push) Has been skipped Details
convert-to-yml / develop-branch (push) Successful in 26s Details

This commit is contained in:
giles 2023-10-22 00:37:59 +01:00
parent 23b23432b5
commit 32591f937a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/convert-to-yml.yml
View File

@ -35,7 +35,7 @@ jobs:
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 fetch
git merge origin/master --allow-unrelated-histories git merge origin/master --allow-unrelated-histories --strategy-option=ours
git push origin HEAD:${{ env.PRODUCTION_BRANCH }} git push origin HEAD:${{ env.PRODUCTION_BRANCH }}
- name: make pull request - name: make pull request
run: | run: |