mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'two-fixes' into 'master'

Browse source 
Two fixes

See merge request fdroid/fdroidserver!975
This commit is contained in:
Jochen Sprickerhof 2021-06-25 06:27:34 +00:00
commit acb123e9f6
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -64,7 +64,7 @@ setup(name='fdroidserver',
packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'], packages=['fdroidserver', 'fdroidserver.asynchronousfilereader'],
scripts=['fdroid', 'makebuildserver'], scripts=['fdroid', 'makebuildserver'],
data_files=get_data_files(), data_files=get_data_files(),
python_requires='>=3.4', python_requires='>=3.5',
cmdclass={'versioncheck': VersionCheckCommand}, cmdclass={'versioncheck': VersionCheckCommand},
setup_requires=[ setup_requires=[
'babel', 'babel',

13
tests/gradle-release-checksums.py
View file

@ -95,6 +95,13 @@ if os.getenv('CI_PROJECT_NAMESPACE') != 'fdroid':
git_repo = git.repo.Repo('.') git_repo = git.repo.Repo('.')
modified = git_repo.git().ls_files(modified=True).split() modified = git_repo.git().ls_files(modified=True).split()
if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in modified): if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in modified):
private_token = os.getenv('PERSONAL_ACCESS_TOKEN')
if not private_token:
print(Fore.RED
+ 'ERROR: GitLab Token not found in PERSONAL_ACCESS_TOKEN!'
+ Style.RESET_ALL)
exit(1)
branch = git_repo.create_head(os.path.basename(__file__), force=True) branch = git_repo.create_head(os.path.basename(__file__), force=True)
branch.checkout() branch.checkout()
git_repo.index.add(['gradlew-fdroid', 'makebuildserver']) git_repo.index.add(['gradlew-fdroid', 'makebuildserver'])
@ -112,12 +119,6 @@ if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in
remote.push(force=True) remote.push(force=True)
git.remote.Remote.rm(git_repo, remote_name) git.remote.Remote.rm(git_repo, remote_name)
private_token = os.getenv('PERSONAL_ACCESS_TOKEN')
if not private_token:
print(Fore.RED
+ 'ERROR: GitLab Token not found in PERSONAL_ACCESS_TOKEN!'
+ Style.RESET_ALL)
exit(1)
gl = gitlab.Gitlab(os.getenv('CI_SERVER_URL'), api_version=4, gl = gitlab.Gitlab(os.getenv('CI_SERVER_URL'), api_version=4,
private_token=private_token) private_token=private_token)
project = gl.projects.get(project_path, lazy=True) project = gl.projects.get(project_path, lazy=True)