Skip to content

[3.23] Java: make JDK 11 version normalisation in gradle buildless test robust #22714

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

Open
sam-robson wants to merge 1 commit into
base: rc/3.23
Choose a base branch
from
Open

[3.23] Java: make JDK 11 version normalisation in gradle buildless test robust #22714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
# The version of gradle used doesn't work on java 17
def test(codeql, use_java_11, java, environment, check_diagnostics):
check_diagnostics.redact += ["attributes.java_vendor"]
check_diagnostics.replacements = [("11\\.[0-9]+\\.[0-9]+", "11")]
# the JDK build provided by the CI runner image may report any number of version components
# (e.g. `11.0.32` or `11.0.32.1`), so keep only the feature version
check_diagnostics.replacements = [(r'"11(\.[0-9]+)+"', '"11"')]
gradle_override_dir = pathlib.Path(tempfile.mkdtemp())
if runs_on.windows:
(gradle_override_dir / "gradle.bat").write_text("@echo off\nexit /b 2\n")
Expand Down
Loading