revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

adding dependencies to project selector

Browse source
This commit is contained in:
Christian Kühnel 2020-02-03 13:42:19 +01:00
parent 2405f5b828
commit ed886a7da2
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Jenkins/Phabricator-windows-pipeline/Jenkinsfile vendored
View file

@ -70,10 +70,7 @@ pipeline {
stage('CMake') { stage('CMake') {
steps { steps {
dir("${LLVM_DIR}"){ dir("${LLVM_DIR}"){
// TODO(kuhnel): disabling because of broken dependencies: powershell "${SCRIPT_DIR}/run_cmake.ps1 -projects detect"
// https://jenkins.llvm-merge-guard.org/job/amd64_windows_vs2017/690/execution/node/53/log/
//powershell "${SCRIPT_DIR}/run_cmake.ps1 -projects detect"
powershell "${SCRIPT_DIR}/run_cmake.ps1"
} }
} }
} }

22
scripts/choose_projects.py
View file

@ -41,6 +41,7 @@ class ChooseProjects:
def __init__(self, llvm_dir: str): def __init__(self, llvm_dir: str):
self.llvm_dir = llvm_dir self.llvm_dir = llvm_dir
self.dependencies = dict() # type: Dict[str,List[str]]
self.usages = dict() # type: Dict[str,List[str]] self.usages = dict() # type: Dict[str,List[str]]
self.all_projects = [] # type: List[str] self.all_projects = [] # type: List[str]
self.excluded_projects = set() # type: Set[str] self.excluded_projects = set() # type: Set[str]
@ -51,7 +52,8 @@ class ChooseProjects:
logging.info('loading project config from {}'.format(self.DEPENDENCIES_FILE)) logging.info('loading project config from {}'.format(self.DEPENDENCIES_FILE))
with open(self.DEPENDENCIES_FILE) as dependencies_file: with open(self.DEPENDENCIES_FILE) as dependencies_file:
config = yaml.load(dependencies_file, Loader=yaml.SafeLoader) config = yaml.load(dependencies_file, Loader=yaml.SafeLoader)
for user, used_list in config['dependencies'].items(): self.dependencies = config['dependencies']
for user, used_list in self.dependencies.items():
for used in used_list: for used in used_list:
self.usages.setdefault(used,[]).append(user) self.usages.setdefault(used,[]).append(user)
self.all_projects = config['allprojects'] self.all_projects = config['allprojects']
@ -72,6 +74,7 @@ class ChooseProjects:
return 0 return 0
affected_projects = self.get_affected_projects(changed_projects) affected_projects = self.get_affected_projects(changed_projects)
affected_projects = self.add_dependencies(affected_projects)
affected_projects = affected_projects - self.excluded_projects affected_projects = affected_projects - self.excluded_projects
print(';'.join(sorted(affected_projects))) print(';'.join(sorted(affected_projects)))
return 0 return 0
@ -132,6 +135,23 @@ class ChooseProjects:
return affected_projects return affected_projects
def add_dependencies(self, projects: Set[str]):
"""Return projects and their dependencies.
All all dependencies to `projects` so that they can be built.
"""
result = set(projects)
last_len = -1
while len(result) != last_len:
last_len = len(result)
changes = set()
for project in result:
if project in self.dependencies:
changes.update(self.dependencies[project])
print(changes)
result.update(changes)
return result
if __name__ == "__main__": if __name__ == "__main__":
logging.basicConfig(filename='choose_projects.log', level=logging.INFO) logging.basicConfig(filename='choose_projects.log', level=logging.INFO)
parser = argparse.ArgumentParser(description='Compute the projects affected by a change.') parser = argparse.ArgumentParser(description='Compute the projects affected by a change.')