StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "roomservice: Try major-only revision if default doesn't exist"

Browse Source 
This reverts commit 39392c99e1.

Change-Id: I124fb3cb668715b1c15a7bcd07f5889785333c16
This commit is contained in:
LuK1337
2024-09-29 21:08:05 +02:00
parent 1408de438a
commit 6f60459814
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build/tools/roomservice.py
View File

@@ -259,9 +259,6 @@ def fetch_dependencies(repo_path):
def has_branch(branches, revision): def has_branch(branches, revision):
return revision in [branch['name'] for branch in branches] return revision in [branch['name'] for branch in branches]
def get_default_revision_no_minor():
return get_default_revision().rsplit('.', 1)[0]
def get_default_or_fallback_revision(repo_name): def get_default_or_fallback_revision(repo_name):
default_revision = get_default_revision() default_revision = get_default_revision()
print("Default revision: %s" % default_revision) print("Default revision: %s" % default_revision)
@@ -273,14 +270,12 @@ def get_default_or_fallback_revision(repo_name):
if has_branch(result, default_revision): if has_branch(result, default_revision):
return default_revision return default_revision
fallbacks = [ get_default_revision_no_minor() ]
if os.getenv('ROOMSERVICE_BRANCHES'): if os.getenv('ROOMSERVICE_BRANCHES'):
fallbacks += list(filter(bool, os.getenv('ROOMSERVICE_BRANCHES').split(' '))) fallbacks = list(filter(bool, os.getenv('ROOMSERVICE_BRANCHES').split(' ')))
for fallback in fallbacks:
for fallback in fallbacks: if has_branch(result, fallback):
if has_branch(result, fallback): print("Using fallback branch: %s" % fallback)
print("Using fallback branch: %s" % fallback) return fallback
return fallback
print("Default revision %s not found in %s. Bailing." % (default_revision, repo_name)) print("Default revision %s not found in %s. Bailing." % (default_revision, repo_name))
print("Branches found:") print("Branches found:")