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

[SKIP CI] .github/zephyr: compare Windows and Linux builds #6950

Merged
merged 3 commits into from
Jan 23, 2023

Conversation

marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Jan 13, 2023

The End.

This makes sure Windows builds and Linux builds produce identical binaries.

Signed-off-by: Marc Herbert [email protected]

@marc-hb marc-hb force-pushed the compare-win branch 6 times, most recently from a32c62e to 8b74913 Compare January 13, 2023 06:08
@marc-hb
Copy link
Collaborator Author

marc-hb commented Jan 13, 2023

Firmware differences between Linux and Windows found in https://github.com/thesofproject/sof/actions/runs/3908863755/jobs/6679699349 should be all fixed by #6920

@lgirdwood
Copy link
Member

Firmware differences between Linux and Windows found in https://github.com/thesofproject/sof/actions/runs/3908863755/jobs/6679699349 should be all fixed by #6920

@marc-hb #6920 now merged.

@marc-hb
Copy link
Collaborator Author

marc-hb commented Jan 18, 2023

Windows and Linux have a different zephyr git describe and BUILD_VERSION in
https://github.com/thesofproject/sof/actions/runs/3951969148/jobs/6766482099

Most likely my fault: commit 68b49c1

marc-hb added a commit to marc-hb/sof that referenced this pull request Jan 18, 2023
`git describe` differences happen, especially when trying to optimize
cloning and this is for instance what happened in
thesofproject#6950 (comment)
where zephyr tags were fetched on Linux but not on Windows

This also makes plain git version differences more obvious; no need to
scroll all the way up and scan the build logs.

Signed-off-by: Marc Herbert <[email protected]>
@marc-hb marc-hb force-pushed the compare-win branch 2 times, most recently from ac6c555 to acc1433 Compare January 18, 2023 22:35
Fetching different tags causes `git describe` output to be different.

Fixes commit 68b49c1 (".github/zephyr: switch Windows build to west
update --narrow")

Signed-off-by: Marc Herbert <[email protected]>
@marc-hb marc-hb force-pushed the compare-win branch 5 times, most recently from deb3252 to 81c30de Compare January 19, 2023 02:28
@marc-hb marc-hb marked this pull request as ready for review January 19, 2023 02:45
@marc-hb
Copy link
Collaborator Author

marc-hb commented Jan 19, 2023

All tests passing now. Binaries generated by Windows and Linux are compared and found identical in https://github.com/thesofproject/sof/actions/runs/3954767889/jobs/6772604198

EDIT: and again in newer https://github.com/thesofproject/sof/actions/runs/3963690378/jobs/6791978755

@aborisovich
Copy link
Contributor

Windows and Linux have a different zephyr git describe and BUILD_VERSION in https://github.com/thesofproject/sof/actions/runs/3951969148/jobs/6766482099

Most likely my fault: commit 68b49c1

I remember that I did not made --narrow there during Windows CI implementation deliberately...

Copy link
Contributor

@aborisovich aborisovich left a comment

Choose a reason for hiding this comment

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

Looks great @marc-hb, I'm really glad the output we have on both OSes is the same.
Found a typo, please fix. And some minor things

.github/workflows/zephyr.yml Show resolved Hide resolved
.github/workflows/zephyr.yml Show resolved Hide resolved
Copy link
Collaborator Author

@marc-hb marc-hb left a comment

Choose a reason for hiding this comment

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

Thanks for the review, see answers below.

.github/workflows/zephyr.yml Show resolved Hide resolved
.github/workflows/zephyr.yml Show resolved Hide resolved
Make CONFIG_BUILD_OUTPUT_STRIPPED mandatory so we can always compare
builds. It makes practically zero build space and time difference and
has huge reproductibility value, see discussion in
zephyrproject-rtos/zephyr#51954

Signed-off-by: Marc Herbert <[email protected]>
@kv2019i kv2019i merged commit cc00c57 into thesofproject:main Jan 23, 2023
@marc-hb marc-hb deleted the compare-win branch January 25, 2023 01:39
kv2019i pushed a commit that referenced this pull request Jan 26, 2023
`git describe` differences happen, especially when trying to optimize
cloning and this is for instance what happened in
#6950 (comment)
where zephyr tags were fetched on Linux but not on Windows

This also makes plain git version differences more obvious; no need to
scroll all the way up and scan the build logs.

Signed-off-by: Marc Herbert <[email protected]>
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.

4 participants