1berry/fdroidserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'deploy-fix-for-nightly' into 'master'

Browse Source 
deploy: use master branch when working complete git-mirror repo

See merge request fdroid/fdroidserver!1666
This commit is contained in:
Torsten Grote 2025-06-23 13:09:57 +00:00
commit 61777e273c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/deploy.py
View File

@ -617,6 +617,13 @@ def update_servergitmirrors(servergitmirrors, repo_section):
For history, there is the archive section, and there is the binary
transparency log.
This will attempt to use the existing remote branch so that it does
not have to push all of the files in the repo each time. Old setups
or runs of `fdroid nightly` might use the "master" branch. For the
"index only" mode, it will recreate the branch from scratch each
time since usually all the files are changed. In any case, the
index files are small compared to the full repo.
"""
from clint.textui import progress
@ -687,7 +694,7 @@ def update_servergitmirrors(servergitmirrors, repo_section):
if is_index_only:
local_branch_name = 'index_only'
else:
local_branch_name = 'full'
local_branch_name = GIT_BRANCH
if local_branch_name in repo.heads:
repo.git.switch(local_branch_name)
else: