mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Merge branch 'fixup-gradle-release-checksums' into 'master'
Fixup gradle release checksums See merge request fdroid/fdroidserver!860
This commit is contained in:
commit
dedc47a3a8
@ -228,6 +228,8 @@ fedora_latest:
|
|||||||
gradle:
|
gradle:
|
||||||
image: debian:bullseye
|
image: debian:bullseye
|
||||||
<<: *apt-template
|
<<: *apt-template
|
||||||
|
variables:
|
||||||
|
GIT_DEPTH: 1000
|
||||||
script:
|
script:
|
||||||
- apt-get install
|
- apt-get install
|
||||||
ca-certificates
|
ca-certificates
|
||||||
|
@ -8,7 +8,7 @@ exec 1>&2
|
|||||||
|
|
||||||
files=`git diff-index --cached HEAD 2>&1 | sed 's/^:.* //' | uniq | cut -b100-500`
|
files=`git diff-index --cached HEAD 2>&1 | sed 's/^:.* //' | uniq | cut -b100-500`
|
||||||
if [ -z "$files" ]; then
|
if [ -z "$files" ]; then
|
||||||
PY_FILES="fdroid makebuildserver setup.py fdroidserver/*.py examples/*.py"
|
PY_FILES="fdroid makebuildserver setup.py fdroidserver/*.py examples/*.py tests/gradle-release-checksums.py"
|
||||||
PY_TEST_FILES="tests/*.TestCase"
|
PY_TEST_FILES="tests/*.TestCase"
|
||||||
SH_FILES="hooks/pre-commit"
|
SH_FILES="hooks/pre-commit"
|
||||||
BASH_FILES="gradlew-fdroid jenkins-build-all jenkins-setup-build-environment jenkins-test completion/bash-completion buildserver/provision-*"
|
BASH_FILES="gradlew-fdroid jenkins-build-all jenkins-setup-build-environment jenkins-test completion/bash-completion buildserver/provision-*"
|
||||||
|
@ -6,7 +6,6 @@ import os
|
|||||||
import re
|
import re
|
||||||
import requests
|
import requests
|
||||||
import subprocess
|
import subprocess
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
from colorama import Fore, Style
|
from colorama import Fore, Style
|
||||||
from distutils.version import LooseVersion
|
from distutils.version import LooseVersion
|
||||||
|
|
||||||
@ -87,15 +86,15 @@ plugin_v_pat = re.compile(r'\nplugin_v=\(([0-9. ]+)\)')
|
|||||||
with open('gradlew-fdroid', 'w') as fp:
|
with open('gradlew-fdroid', 'w') as fp:
|
||||||
fp.write(plugin_v_pat.sub('\nplugin_v=(%s)' % plugin_v, gradlew_fdroid))
|
fp.write(plugin_v_pat.sub('\nplugin_v=(%s)' % plugin_v, gradlew_fdroid))
|
||||||
|
|
||||||
if os.getenv('CI_PROJECT_NAMESPACE') != 'fdroid-bot':
|
if os.getenv('CI_PROJECT_NAMESPACE') != 'fdroid':
|
||||||
p = subprocess.run(['git', '--no-pager', 'diff'])
|
p = subprocess.run(['git', '--no-pager', 'diff'])
|
||||||
print(p.stdout)
|
print(p.stdout)
|
||||||
exit(errors)
|
exit(errors)
|
||||||
|
|
||||||
|
# This only runs after commits are pushed to fdroid/fdroidserver
|
||||||
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()
|
if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in modified):
|
||||||
and ('gradlew-fdroid' in modified or 'makebuildserver' in modified)):
|
|
||||||
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'])
|
||||||
@ -118,7 +117,7 @@ if (git_repo.is_dirty()
|
|||||||
print(Fore.RED
|
print(Fore.RED
|
||||||
+ 'ERROR: GitLab Token not found in PERSONAL_ACCESS_TOKEN!'
|
+ 'ERROR: GitLab Token not found in PERSONAL_ACCESS_TOKEN!'
|
||||||
+ Style.RESET_ALL)
|
+ Style.RESET_ALL)
|
||||||
sys.exit(1)
|
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)
|
||||||
|
Loading…
Reference in New Issue
Block a user