Skip to content

Commit

Permalink
SBOM validation: Fix JDK11/17 windows compiler detection
Browse files Browse the repository at this point in the history
Signed-off-by: Stewart X Addison <[email protected]>
  • Loading branch information
sxa committed Nov 9, 2023
1 parent 569ba0d commit 2c43960
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tooling/validateSBOMcontent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ elif echo "$SBOMFILE" | grep _x64_windows_; then
#EXPECTED_FREETYPE="https://github.com/freetype/freetype/commit/ec8853cd18e1a0c275372769bdad37a79550ed66"
elif [ "${MAJORVERSION}" -ge 20 ]; then
EXPECTED_COMPILER="microsoft (Microsoft Visual Studio 2022)"
else
EXPECTED_COMPILER="microsoft (Microsoft Visual Studio 2019)"
fi
elif echo "$SBOMFILE" | grep _x86-32_windows_; then
if [ "${MAJORVERSION}" = "8" ]; then
Expand Down Expand Up @@ -112,7 +114,7 @@ if ! git ls-remote "${GITREPO}" | grep "${GITSHA}"; then
if echo "$1" | grep '[0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9][0-9]' 2>/dev/null; then
echo "Ignoring return code as filename looks like a nightly"
else
echo "This can also happen with a branch being used and not a tag as we do for GAs so not failing"kd
echo "This can also happen with a branch being used and not a tag as we do for GAs so not failing"
echo "Note: As this is a warning message this will not cause a non-zero return code by itself"
# RC=1
fi
Expand Down

0 comments on commit 2c43960

Please sign in to comment.