From: Quentin Schulz <[email protected]> It happened that the git repositories were dirty and resulted in incorrect files being used. Let's use git clean -ffdx to force a completely clean git repositories before and after checking out a branch so that nothing is left from or to another branch build. Also git reset --hard to undo changes to tracked files.
Cc: Quentin Schulz <[email protected]> Reported-by: Peter Kjellerstedt <[email protected]> #https://lore.kernel.org/yocto-docs/[email protected]/ Signed-off-by: Quentin Schulz <[email protected]> --- v2: - re-added git reset --hard back, - added git reset --hard after git checkout too just to be on the safe side, - added Reported-by and the link to the discussion, scripts/run-docs-build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index c6b3965..970d8bc 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -61,6 +61,8 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for echo Building bitbake $branch branch git checkout $branch + git reset --hard + git clean -ffdx git checkout origin/master releases.rst make clean SPHINXOPTS="-j auto" make publish @@ -81,6 +83,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for cp -r ./_build/final/* $outputdir/bitbake/$branch git reset --hard + git clean -ffdx done if [ "$PUBLISH" -ne 0 ]; then @@ -101,7 +104,7 @@ git checkout origin/master set_versions.py #latest_tag=$(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" --sort="version:refname" 'yocto-*' | tail -1 | sed 's/yocto-//') latest_tag=$(./set_versions.py getlatest) git reset --hard -git clean -f +git clean -ffdx for branch in dunfell $(git branch --remote --contains "$first_sphinx_commit" --format '%(refname:lstrip=3)') $(git tag --contains "$first_sphinx_commit" --contains "$first_dunfell_sphinx_commit" 'yocto-*') transition; do if [ "$branch" = "HEAD" ]; then @@ -116,6 +119,8 @@ for branch in dunfell $(git branch --remote --contains "$first_sphinx_commit" -- echo Building $branch git checkout $branch + git reset --hard + git clean -ffdx if [ -e "${scriptdir}/docs-build-patches/${branch}/" ]; then echo Adding patch for $branch @@ -161,7 +166,7 @@ for branch in dunfell $(git branch --remote --contains "$first_sphinx_commit" -- cp -r ./_build/final/* $outputdir/$branch git reset --hard - git clean -f + git clean -ffdx done # Update bitbake switchers.js with the copy from master ypdocs -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#58329): https://lists.yoctoproject.org/g/yocto/message/58329 Mute This Topic: https://lists.yoctoproject.org/mt/94302082/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
