Skip to content

Update validateSBOMcontent.sh's EXPECTED_FREETYPE and fix static libs content count check #4221

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

Merged
merged 4 commits into from
Aug 18, 2025

Conversation

sxa
Copy link
Member

@sxa sxa commented Aug 15, 2025

Ref upstream PRs in various repositories e.g. openjdk/jdk11u-dev#3011
Fixes #4220

@sxa sxa self-assigned this Aug 15, 2025
@karianna
Copy link
Contributor

@sxa I think if you rebase it should pick up the corrected CA cert count

Signed-off-by: Stewart X Addison <sxa@redhat.com>
@sxa sxa force-pushed the july25_sbomcontentupdates branch from b92d077 to 587b704 Compare August 18, 2025 10:58
@sxa
Copy link
Member Author

sxa commented Aug 18, 2025

Added change to fix #4222 (avoids merge conflict by having a separate PR)

@sxa sxa changed the title Update validateSBOMcontent.sh's EXPECTED_FREETYPE Update validateSBOMcontent.sh's EXPECTED_FREETYPE and fix static libs content count check Aug 18, 2025
@sxa
Copy link
Member Author

sxa commented Aug 18, 2025

@sxa I think if you rebase it should pick up the corrected CA cert count

Merged in latest changes

@sxa
Copy link
Member Author

sxa commented Aug 18, 2025

Final test with the additional fix for static-libs count after reduction in the number on AIX is at https://ci.adoptium.net/job/build-scripts/job/release/job/download_and_sbom_validation/79/

Signed-off-by: Stewart X Addison <sxa@redhat.com>
@sxa sxa force-pushed the july25_sbomcontentupdates branch from 3bd3be1 to f42755f Compare August 18, 2025 13:29
Co-authored-by: Severin Gehwolf <jerboaa@gmail.com>
@sxa
Copy link
Member Author

sxa commented Aug 18, 2025

I've completed the testing with the main releases - there will need to be some additional fixes for the upcoming jdk25 and 26 releases but this is good for now and those other updates can go into a separate PR later.

@sxa sxa merged commit 1ac572c into adoptium:master Aug 18, 2025
29 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.

EXPECTED_FREETYPE versions are wrong for jdk11 and 21
3 participants