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

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

This commit is contained in:
giles 2023-10-21 23:56:37 +01:00
parent 55a39c6132
commit 58d5db9c83
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,13 @@ 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 git checkout master
git pull
git log -5
git checkout ${{ env.PRODUCTION_BRANCH }}
git pull
git log -5
git merge master
git push origin HEAD git push origin HEAD
- name: make pull request - name: make pull request
run: | run: |