[yocto-autobuilder-helper,4/6] scripts: run-docs-build: use set_versions.py and switchers.js.in from master

Message ID 20220419170730.124287-5-foss+yocto@0leil.net
State New
Headers show
Series [RFC] docs: update Bitbake objects.inv location for master branch | expand

Commit Message

Quentin Schulz April 19, 2022, 5:07 p.m. UTC
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>

set_versions.py and switchers.js.in need to be up-to-date so that a
consistent behavior is kept between different branches and tags of the

Right now, kirkstone branch is lagging behind master and therefore does
not have the latest changes from master (e.g. the new obsolete
algorithm, which obviously isn't an issue right now, but will be in two
years). Using master version for those scripts also lightens the
maintenance burden.

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


diff --git a/scripts/run-docs-build b/scripts/run-docs-build
index a060a31..8044b60 100755
--- a/scripts/run-docs-build
+++ b/scripts/run-docs-build
@@ -102,11 +102,9 @@  for branch in dunfell $(git branch --remote --contains "$first_sphinx_commit" --
         git am "${scriptdir}/docs-build-patches/${branch}/"000*
-    git checkout master releases.rst
+    git checkout master releases.rst sphinx-static/switchers.js.in set_versions.py
     if [ -e poky.yaml ]; then
-        git checkout master sphinx-static/switchers.js.in
         cp poky.yaml poky.yaml.in
-        git checkout master set_versions.py
         case $branch in
                 ./set_versions.py $(echo "$branch" | sed 's/yocto-//')