mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-02 17:20:25 +02:00
Merge branch 'checkupdates_block_jdk11' into 'master'
Drop JDK 11 on checkupdates See merge request fdroid/fdroidserver!1248
This commit is contained in:
commit
e76aac414f
@ -521,6 +521,21 @@ def checkupdates_app(app):
|
|||||||
|
|
||||||
if not gotcur:
|
if not gotcur:
|
||||||
newbuilds = copy.deepcopy(builds[-len(vercodes):])
|
newbuilds = copy.deepcopy(builds[-len(vercodes):])
|
||||||
|
|
||||||
|
bullseye_blocklist = [
|
||||||
|
'apt-get install -y openjdk-11-jdk',
|
||||||
|
'apt-get install -y openjdk-11-jdk-headless',
|
||||||
|
'apt-get install -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless',
|
||||||
|
'apt-get install -y -t stretch-backports openjdk-11-jdk-headless openjdk-11-jre-headless',
|
||||||
|
'update-alternatives --auto java',
|
||||||
|
]
|
||||||
|
|
||||||
|
for build in newbuilds:
|
||||||
|
if "sudo" in build:
|
||||||
|
build["sudo"] = [line for line in build["sudo"] if line not in bullseye_blocklist]
|
||||||
|
if build["sudo"] == ['apt-get update']:
|
||||||
|
build["sudo"] = ''
|
||||||
|
|
||||||
for b, v in zip(newbuilds, vercodes):
|
for b, v in zip(newbuilds, vercodes):
|
||||||
b.disable = False
|
b.disable = False
|
||||||
b.versionCode = v
|
b.versionCode = v
|
||||||
|
Loading…
Reference in New Issue
Block a user