Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manifest: bsim: Do not import but replicate in main manifest #59023

Merged
merged 3 commits into from
Jun 8, 2023
Merged

manifest: bsim: Do not import but replicate in main manifest #59023

merged 3 commits into from
Jun 8, 2023

Commits on Jun 7, 2023

  1. manifest: bsim: Do not import but replicate in main manifest 

    Due to a limitation in the west import feature,
a project cannot both have an import and be part of a group.
Moreover, when a project has an import and is not filtered
out, it is required for that project to be present
for most west commands to work.

As the bsim project is not filtered by default,
it causes trouble for users who never run a
west update but try to use west further.

To work around this issue, let's disable the import
in the bsim project, and instead replicate its content
inside Zephyr's main manifest.

Having a replica of the babblesim manifest content
is likely to cause some confusion in users,
wrt to which version of components they are using.
So whenever west supports both imports and groups, or another
simple and nicer way of working around this, it should be used.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
    @aescolar
    aescolar committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    ce614ea View commit details
    Browse the repository at this point in the history

  2. Revert "ci: doc-build: Pull 'bsim' west project" 

    This reverts commit 00130b7.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
    @aescolar
    aescolar committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    49ed947 View commit details
    Browse the repository at this point in the history

  3. CI: bsim workflow: Fix getting bsim revision 

    As the bsim repo is disabled by default, west list bsim -f {sha}
fails.
Instead get the revision field which works.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
    @aescolar
    aescolar committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    64eb4a1 View commit details
    Browse the repository at this point in the history