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.

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

Merged
merged 4 commits into from
Aug 18, 2025
+14 −10
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
587b704
Update validateSBOMcontent.sh's EXPECTED_FREETYPE and static-libs count
sxa Aug 15, 2025
6abc67e
Merge branch 'master' into july25_sbomcontentupdates
sxa Aug 18, 2025
f42755f
Fix AIX compiler version for OpenXL17 on JDK22+
sxa Aug 18, 2025
cab8d7d
Update tooling/release_download_test.sh
sxa Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tooling/release_download_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ verify_valid_archives() {
print_error "Failed to verify that ${A} can be extracted"
RC=4
fi
# NOTE: 38 chosen because the static-libs is 38 for JDK21/AIX - maybe switch for different tarballs in the future?
if [ "$(tar tfz "${A}" | wc -l)" -lt 38 ]; then
print_error "Less than 38 files in ${A} - that does not seem correct"
# NOTE: 37 chosen because the static-libs is 37 for JDK21/AIX - maybe switch for different tarballs in the future?
if [ "$(tar tfz "${A}" | wc -l)" -lt 37 ]; then
print_error "Fewer than 37 files in ${A} - that does not seem correct"
RC=4
fi
done
Expand Down Expand Up @@ -285,7 +285,7 @@ verify_valid_archives() {
RC=4
fi
if [ "$(tar tfz "${A}" | wc -l)" -lt 45000 ]; then
print_error "less than 45000 files in source archive ${A} - that does not seem correct"
print_error "Fewer than 45000 files in source archive ${A} - that does not seem correct"
RC=4
fi
done
Expand Down
16 changes: 10 additions & 6 deletions tooling/validateSBOMcontent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,15 @@ if echo "$SBOMFILE" | grep _solaris_; then
EXPECTED_FREETYPE=2.4.9
EXPECTED_COMPILER="solstudio (Oracle Solaris Studio)"
elif echo "$SBOMFILE" | grep _aix_; then
EXPECTED_COMPILER="xlc (IBM XL C/C++)"
if [ "$MAJORVERSION" -lt 21 ]; then
EXPECTED_COMPILER="xlc (IBM XL C/C++)"
else
EXPECTED_COMPILER="clang (clang/LLVM)"
fi
if [ "$MAJORVERSION" -lt 17 ]; then
EXPECTED_FREETYPE=2.8.0
else
EXPECTED_FREETYPE=2.13.2 # Bundled version
EXPECTED_FREETYPE=2.13.3 # Bundled version
fi
elif echo "$SBOMFILE" | grep _alpine-linux_ > /dev/null; then
EXPECTED_FREETYPE=2.11.1
Expand Down Expand Up @@ -78,17 +82,17 @@ elif echo "$SBOMFILE" | grep 64_windows_; then
EXPECTED_FREETYPE=2.8.1
EXPECTED_COMPILER="microsoft (Microsoft Visual Studio 2022)"
if [ "${MAJORVERSION}" = "11" ] || [ "${MAJORVERSION}" = "17" ]; then
EXPECTED_FREETYPE=2.13.2 # Bundled version
EXPECTED_FREETYPE=2.13.3 # Bundled version
fi
elif echo "$SBOMFILE" | grep _x86-32_windows_; then
EXPECTED_FREETYPE=2.13.2 # Bundled version
EXPECTED_FREETYPE=2.13.3 # Bundled version
EXPECTED_COMPILER="microsoft (Microsoft Visual Studio 2022)"
if [ "${MAJORVERSION}" = "8" ]; then
EXPECTED_FREETYPE=2.5.3
fi
elif echo "$SBOMFILE" | grep _mac_; then
# NOTE: mac/x64 native builds >=11 were using "clang (clang/LLVM from Xcode 10.3)"
EXPECTED_FREETYPE=2.13.2 # Bundled version
EXPECTED_FREETYPE=2.13.3 # Bundled version
EXPECTED_COMPILER="clang (clang/LLVM from Xcode 15.2)"
# shellcheck disable=SC2166
if [ "${MAJORVERSION}" = "8" ] && echo "$SBOMFILE" | grep _x64_; then
Expand All @@ -97,7 +101,7 @@ elif echo "$SBOMFILE" | grep _mac_; then
fi
fi

[ "${MAJORVERSION}" -ge 20 ] && EXPECTED_FREETYPE=2.13.2 # Bundled version
[ "${MAJORVERSION}" -ge 20 ] && EXPECTED_FREETYPE=2.13.3 # Bundled version

RC=0
if echo "$SBOMFILE" | grep 'linux_'; then
Expand Down
Loading