diff mbox series

[yocto-autobuilder-helper,6/6] scripts: run-docs-build: factor out yocto-docs tags and branches building

Message ID 20220318163651.3016936-6-foss+yocto@0leil.net
State New
Headers show
Series [yocto-autobuilder-helper,1/6] scripts: run-docs-build: factor out all bitbake branches building | expand

Commit Message

Quentin Schulz March 18, 2022, 4:36 p.m. UTC 
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>

Except patching which is specific to tags and yocto- tag prefix
stripping, the logic is identical, so let's merge both loops together.

Cc: Quentin Schuls <foss+yocto@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
 scripts/run-docs-build | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

Comments

Michael Opdenacker March 21, 2022, 9:19 a.m. UTC | #1 
On 3/18/22 17:36, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
>
> Except patching which is specific to tags and yocto- tag prefix
> stripping, the logic is identical, so let's merge both loops together.
>
> Cc: Quentin Schuls <foss+yocto@0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> ---
>  scripts/run-docs-build | 36 ++++++++++++------------------------
>  1 file changed, 12 insertions(+), 24 deletions(-)


Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Thanks for making the script much more readable :-)
Cheers
Michael.
diff mbox series

Patch

diff --git a/scripts/run-docs-build b/scripts/run-docs-build
index ab5b6db..ceda213 100755
--- a/scripts/run-docs-build
+++ b/scripts/run-docs-build
@@ -71,7 +71,8 @@  cd $ypdocs
 
 # Again, keeping even the no longer supported releases (see above comment)
 first_sphinx_commit=01dd5af7954e24552aca022917669b27bb0541ed
-for branch in dunfell transition $(git branch --remote --contains "$first_sphinx_commit" --format '%(refname:lstrip=3)'); do
+first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236
+for branch in dunfell transition $(git branch --remote --contains "$first_sphinx_commit" --format '%(refname:lstrip=3)') $(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" 'yocto-*'); do
     if [ "$branch" = "HEAD" ]; then
         continue
     fi
@@ -82,12 +83,21 @@  for branch in dunfell transition $(git branch --remote --contains "$first_sphinx
         continue
     fi
 
-    echo Building $branch branch
+    echo Building $branch
     git checkout $branch
+
+    if [ -e "${scriptdir}/docs-build-patches/${branch}/" ]; then
+        echo Adding patch for $branch
+        git am "${scriptdir}/docs-build-patches/${branch}/"000*
+    fi
+
     git checkout master releases.rst
     make clean
     make publish
 
+    # Strip yocto- from tag names
+    branch=$(echo "$branch" | sed 's/yocto-//')
+
     if [ "$branch" = "master-next" ]; then
         branch="next"
 	mkdir $outputdir/$branch
@@ -101,28 +111,6 @@  for branch in dunfell transition $(git branch --remote --contains "$first_sphinx
     git reset --hard
 done
 
-# Yocto Project releases/tags
-first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236
-
-cd $ypdocs
-for tag in $(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" 'yocto-*'); do
-    echo Processing $tag
-    cd $ypdocs
-    git checkout $tag
-    if [ -e "${scriptdir}/docs-build-patches/${tag}/" ]; then
-        echo Adding patch for $tag
-        git am "${scriptdir}/docs-build-patches/${tag}/"000*
-    fi
-    git checkout master releases.rst
-    make clean
-    make publish
-    version=$(echo $tag | cut -c7-)
-    mkdir $outputdir/$version
-    cp -r ./_build/final/* $outputdir/$version
-    git reset --hard
-    echo Finished processing $tag
-done
-
 # get current release (e.g. most recent tag), and add a 'current' link
 tag=$(git tag --list 'yocto-*' | sort --version-sort | tail -1 | cut -c7-)
 echo Linking to $tag as current