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.

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

Add BSP version to the names of output tars and wics #62

Merged
merged 2 commits into from
Nov 22, 2024

Conversation

jsuhaas22
Copy link
Collaborator

There is a requirement to include the BSP versions in the names of the images we distribute. So include the version in the name.

@jsuhaas22 jsuhaas22 force-pushed the include-version-in-output branch 11 times, most recently from 78c486d to 8eeca31 Compare November 12, 2024 08:39
@cshilwant
Copy link
Member

@jsuhaas22 Ideally we should integrate #61 before this PR & then rebase on top to ensure the workflows tests 10.01.06 baseline tag.

Currently the workflows would still pick 10.00.07

@jsuhaas22 jsuhaas22 force-pushed the include-version-in-output branch 2 times, most recently from 6f8dc4c to 66c2c51 Compare November 19, 2024 08:37
create-wic.sh Outdated

distro_codename=($(read_build_config ${BUILD} distro_codename))
bsp_version=($(read_bsp_config ${distro_codename} bsp_version))
BUILD_FULL="${BUILD}-${bsp_version}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be more clear what file is being used if you drop BUILD_FULL and just use ${BUILD}-${bsp_version} directly below.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the PR.

@jsuhaas22 jsuhaas22 force-pushed the include-version-in-output branch from 66c2c51 to 893e3e2 Compare November 20, 2024 05:08
build.sh Outdated
@@ -60,6 +61,7 @@ do
echo "machine: ${machine}"
echo "bsp_version: ${bsp_version}"
echo "distro: ${distro}"
echo "distro_bsp_version: ${distro_bsp_version}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You already print distro above, why not just print bsp_version here.

build.sh Outdated
@@ -68,9 +70,9 @@ do

validate_build ${machine} ${bsp_version} ${distro_codename}/${distro}.yaml

generate_rootfs ${distro} ${distro_codename} ${machine}
generate_rootfs ${distro} ${distro_codename} ${machine} ${distro_bsp_version}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are already passing in the distro, you should only need to pass in the bsp_version. You can concat inside the function called here as needed.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made these changes @glneo

There is a requirement to include the BSP versions in the names of the
images we distribute. So include the version in the name.

Signed-off-by: Suhaas Joshi <[email protected]>
Since we are now appending the BSP version in image's/tar's names,
Github Actions also needs to be updated to work with a file which has
the BSP version included in it. So update Github Actions to work with
the new naming scheme.

Signed-off-by: Suhaas Joshi <[email protected]>
@jsuhaas22 jsuhaas22 force-pushed the include-version-in-output branch from 893e3e2 to a41ce24 Compare November 21, 2024 07:53
@jsuhaas22 jsuhaas22 merged commit c80d680 into master Nov 22, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants