From 398f9f09b36b877955af250f4e26f0914c3ea934 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 17 Dec 2024 14:24:27 -0800 Subject: [PATCH 1/5] sphinx: install requirements.txt --- zorg/buildbot/builders/SphinxDocsBuilder.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zorg/buildbot/builders/SphinxDocsBuilder.py b/zorg/buildbot/builders/SphinxDocsBuilder.py index 30c87434d..9bc4f3e5f 100644 --- a/zorg/buildbot/builders/SphinxDocsBuilder.py +++ b/zorg/buildbot/builders/SphinxDocsBuilder.py @@ -176,6 +176,12 @@ def getSphinxRuntimesDocsBuildFactory( src_to_build_dir='runtimes', **kwargs) # Pass through all the extra arguments. + f.addStep(ShellCommand( + name="Install pip depenencies", + command=['pip install -r llvm-project/llvm/docs/requirements.txt'], + workdir=f.obj_dir, + )) + UnifiedTreeBuilder.addCmakeSteps( f, cleanBuildRequested=f.cleanBuildRequested, From 8641d67570debe22036dd03b86937f4d547efac1 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 17 Dec 2024 14:28:18 -0800 Subject: [PATCH 2/5] typo --- zorg/buildbot/builders/SphinxDocsBuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zorg/buildbot/builders/SphinxDocsBuilder.py b/zorg/buildbot/builders/SphinxDocsBuilder.py index 9bc4f3e5f..8d4215808 100644 --- a/zorg/buildbot/builders/SphinxDocsBuilder.py +++ b/zorg/buildbot/builders/SphinxDocsBuilder.py @@ -177,7 +177,7 @@ def getSphinxRuntimesDocsBuildFactory( **kwargs) # Pass through all the extra arguments. f.addStep(ShellCommand( - name="Install pip depenencies", + name="Install pip dependencies", command=['pip install -r llvm-project/llvm/docs/requirements.txt'], workdir=f.obj_dir, )) From 8184e7fd11a5f38965bda7959dbf79cce65d79de Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 17 Dec 2024 14:29:52 -0800 Subject: [PATCH 3/5] use llvm_srcdir --- zorg/buildbot/builders/SphinxDocsBuilder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zorg/buildbot/builders/SphinxDocsBuilder.py b/zorg/buildbot/builders/SphinxDocsBuilder.py index 8d4215808..2003c359c 100644 --- a/zorg/buildbot/builders/SphinxDocsBuilder.py +++ b/zorg/buildbot/builders/SphinxDocsBuilder.py @@ -178,8 +178,8 @@ def getSphinxRuntimesDocsBuildFactory( f.addStep(ShellCommand( name="Install pip dependencies", - command=['pip install -r llvm-project/llvm/docs/requirements.txt'], - workdir=f.obj_dir, + command=['pip install -r llvm/docs/requirements.txt'], + workdir=llvm_srcdir, )) UnifiedTreeBuilder.addCmakeSteps( From 9f4b552b6fd0ee7d9c49ff59f15ab1e142eda998 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 17 Dec 2024 14:33:34 -0800 Subject: [PATCH 4/5] f.llvm_srcdir ? --- zorg/buildbot/builders/SphinxDocsBuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zorg/buildbot/builders/SphinxDocsBuilder.py b/zorg/buildbot/builders/SphinxDocsBuilder.py index 2003c359c..0b0961696 100644 --- a/zorg/buildbot/builders/SphinxDocsBuilder.py +++ b/zorg/buildbot/builders/SphinxDocsBuilder.py @@ -179,7 +179,7 @@ def getSphinxRuntimesDocsBuildFactory( f.addStep(ShellCommand( name="Install pip dependencies", command=['pip install -r llvm/docs/requirements.txt'], - workdir=llvm_srcdir, + workdir=f.llvm_srcdir, )) UnifiedTreeBuilder.addCmakeSteps( From 0cc13d4ec1c417c5e22312a50975435cb068f13e Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 17 Dec 2024 14:47:49 -0800 Subject: [PATCH 5/5] hashed --- zorg/buildbot/builders/SphinxDocsBuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zorg/buildbot/builders/SphinxDocsBuilder.py b/zorg/buildbot/builders/SphinxDocsBuilder.py index 0b0961696..13a8ce9f6 100644 --- a/zorg/buildbot/builders/SphinxDocsBuilder.py +++ b/zorg/buildbot/builders/SphinxDocsBuilder.py @@ -178,7 +178,7 @@ def getSphinxRuntimesDocsBuildFactory( f.addStep(ShellCommand( name="Install pip dependencies", - command=['pip install -r llvm/docs/requirements.txt'], + command=['pip install -r llvm/docs/requirements-hashed.txt'], workdir=f.llvm_srcdir, ))