liquid-development/game-tracker
3
1
Fork 0
Code Issues 8 Pull Requests 4 Actions Releases 1 Activity

Implemented pull and no rebase in config

Browse Source
This commit is contained in:
Felix Kirchner
2026-01-24 13:15:41 +01:00
parent a6f6f18fcd
commit 0c4c54dd04
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitea/workflows/push.yaml
View File

@@ -92,6 +92,7 @@ jobs:
run: | run: |
git config --global user.name "Gitea Actions [bot]" git config --global user.name "Gitea Actions [bot]"
git config --global user.email "actions@yannick-weigert.de" git config --global user.email "actions@yannick-weigert.de"
git config pull.rebase false
git pull origin ${{ gitea.ref_name }} git pull origin ${{ gitea.ref_name }}
git add pubspec.yaml git add pubspec.yaml
git commit -m "Updated version number [skip ci]" git commit -m "Updated version number [skip ci]"
@@ -131,6 +132,7 @@ jobs:
if [ -n "$(git status --porcelain lib test)" ]; then if [ -n "$(git status --porcelain lib test)" ]; then
git config --global user.name "Gitea Actions [bot]" git config --global user.name "Gitea Actions [bot]"
git config --global user.email "actions@yannick-weigert.de" git config --global user.email "actions@yannick-weigert.de"
git config pull.rebase false
git pull origin ${{ gitea.ref_name }} git pull origin ${{ gitea.ref_name }}
git add lib test git add lib test
git commit -m "Updated licenses [skip ci]" git commit -m "Updated licenses [skip ci]"
@@ -182,6 +184,8 @@ jobs:
if [ -n "$(git status --porcelain lib test)" ]; then if [ -n "$(git status --porcelain lib test)" ]; then
git config --global user.name "Gitea Actions [bot]" git config --global user.name "Gitea Actions [bot]"
git config --global user.email "actions@yannick-weigert.de" git config --global user.email "actions@yannick-weigert.de"
git config pull.rebase false
git pull origin ${{ gitea.ref_name }}
git add lib test git add lib test
git commit -m "Auto-format code [skip ci]" git commit -m "Auto-format code [skip ci]"
git push origin HEAD:${{ gitea.ref_name }} git push origin HEAD:${{ gitea.ref_name }}