Revert "Revert "Add six to the list of python dependencies.""

This reverts commit 42519d0.
Saleniece · Nov 1, 2019 · 8d729f6 · 8d729f6
1 parent 172fefe
commit 8d729f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/zorg/jenkins/clang_build_dependencies.dep b/zorg/jenkins/clang_build_dependencies.dep
@@ -2,4 +2,5 @@ os_version == 10.13.5 # Oldest CI nodes are currently 10.13.3
 brew cmake >= 3.11.2 # LLVM docs state this is the minimum version required.
 brew ninja >= 1.8.2 # Stage2 verbose output
 pip psutil >= 5.4.5 # Required for timeouts in the GTest Suite.
+pip six >= 1.11.0 # Required for urllib
 xcode == 9.4.1
diff --git a/zorg/jenkins/monorepo_build.py b/zorg/jenkins/monorepo_build.py
@@ -491,6 +491,9 @@ def parse_settings_from_output(working_dir, cmd):
 def lldb_cmake_builder(target, variant=None):
     """Do a CMake build of lldb."""
 
+    if not os.getenv("TESTING"):
+        dep.parse_dependencies([here + "/clang_build_dependencies.dep"])
+
     test_dir = os.path.join(conf.workspace, 'test')
     log_dir = os.path.join(test_dir, 'logs')
     results_file = os.path.join(test_dir, 'results.xml')