From: Quentin Schulz <[email protected]> The commit that introduced Sphinx support in yocto-docs is 01dd5af7954e24552aca022917669b27bb0541ed. Any tag containing this commit is buildable by sphinx.
Dunfell tags don't all have Sphinx support. However, all tags containing the introducing commit c25fe058b88b893b0d146f3ed27320b47cdec236 are buildable by sphinx. Therefore, let's just list all tags which contains either of those two commits instead of the complex series of pipes and shell commands. Cc: Quentin Schulz <[email protected]> Signed-off-by: Quentin Schulz <[email protected]> --- scripts/run-docs-build | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index 1656975..ab5b6db 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -102,27 +102,25 @@ for branch in dunfell transition $(git branch --remote --contains "$first_sphinx done # Yocto Project releases/tags -v_sphinx='yocto-3.1.5' #This and newer versions have Sphinx docs. +first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236 + cd $ypdocs -for tag in $(git tag --list 'yocto-*'); do - first=$(printf '%s\n%s' $tag $v_sphinx | sort --version-sort | head -n1) - if [ "$first" = "$v_sphinx" ]; then - 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 +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 -- 2.35.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#56493): https://lists.yoctoproject.org/g/yocto/message/56493 Mute This Topic: https://lists.yoctoproject.org/mt/89872329/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
