Hi Quentin, On Mon, 3 Oct 2022 19:04:01 +0200 "Quentin Schulz" <[email protected]> wrote:
> 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 > > Cc: Quentin Schulz <[email protected]> > Signed-off-by: Quentin Schulz <[email protected]> > --- > scripts/run-docs-build | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/scripts/run-docs-build b/scripts/run-docs-build > index c6b3965..69e3257 100755 > --- a/scripts/run-docs-build > +++ b/scripts/run-docs-build > @@ -61,6 +61,7 @@ for branch in 1.46 $(git branch --remote --contains > "$first_sphinx_commit" --for > > echo Building bitbake $branch branch > git checkout $branch > + git clean -ffdx > git checkout origin/master releases.rst > make clean > SPHINXOPTS="-j auto" make publish > @@ -80,7 +81,7 @@ for branch in 1.46 $(git branch --remote --contains > "$first_sphinx_commit" --for > fi > > cp -r ./_build/final/* $outputdir/bitbake/$branch > - git reset --hard > + git clean -ffdx Sure this is correct? 'git clean -ffdx' does not revert changes to tracked files, be them staged or not. > done > > if [ "$PUBLISH" -ne 0 ]; then > @@ -100,8 +101,7 @@ > first_dunfell_sphinx_commit=c25fe058b88b893b0d146f3ed27320b47cdec236 > 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 +116,7 @@ for branch in dunfell $(git branch --remote --contains > "$first_sphinx_commit" -- > > echo Building $branch > git checkout $branch > + git clean -ffdx > > if [ -e "${scriptdir}/docs-build-patches/${branch}/" ]; then > echo Adding patch for $branch > @@ -160,8 +161,7 @@ for branch in dunfell $(git branch --remote --contains > "$first_sphinx_commit" -- > fi > > cp -r ./_build/final/* $outputdir/$branch > - git reset --hard > - git clean -f > + git clean -ffdx Same here. -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#58255): https://lists.yoctoproject.org/g/yocto/message/58255 Mute This Topic: https://lists.yoctoproject.org/mt/94095578/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
