| Message ID | 20260330-fix-docs-build-v1-1-1c3e962a4c13@bootlin.com |
|---|---|
| State | New |
| Headers | show |
| Series | [yocto-autobuilder-helper] scripts/run-docs-build: fix check on request branch | expand |
diff --git a/scripts/run-docs-build b/scripts/run-docs-build index 3271328..dfe3265 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -192,7 +192,7 @@ for branch in "$ypdocsbranch" dunfell $(git branch --remote --contains "$first_s fi # Do not build contrib/ branches as they are development branches only # Do build request branch though! - if echo "$branch" | grep -v "$ypdocsbranch" | grep -q -E "^contrib/"; then + if echo "$branch" | grep -v "^$ypdocsbranch$" | grep -q -E "^contrib/"; then continue fi
Fix the check on the request branch to be more precise, as for example ypdocsbranch equal to "master" could make branches such as "contrib/name/master-next" be built. This was causing some of the contrib/ branches to be matched with their closest branch (as per our algorithm to determine a version number in set_versions.py), laverne, which in turns does not have a bitbake_mapping and made our build fail. Signed-off-by: Antonin Godard <antonin.godard@bootlin.com> --- Also I'm guessing we are seeing this now as some tags have been removed and some branches created and this changed the list of closest matches, producing the failure. Only a guess though. --- scripts/run-docs-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 7e475b822d164e02f03a60cf4e02f0db0c4d086e change-id: 20260330-fix-docs-build-12b47fa2ff5a