From 4197d7bd20bfc836b7e580b3d30aa9e72fee7e61 Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Wed, 11 Jan 2023 19:49:32 +0000 Subject: [PATCH] Android tests: use Java 11 under Actions Some runners still default to Java 8 (e.g. windows-2022 and macos-12), so we need to manually pull Java 11 in in such cases. --- .../android-sample-kotlin-build-script-no-wrapper/test.py | 5 +++++ .../java/android-sample-kotlin-build-script/test.py | 5 +++++ .../all-platforms/java/android-sample-no-wrapper/test.py | 5 +++++ .../test.py | 5 +++++ .../android-sample-old-style-kotlin-build-script/test.py | 5 +++++ .../java/android-sample-old-style-no-wrapper/test.py | 5 +++++ .../all-platforms/java/android-sample-old-style/test.py | 5 +++++ .../all-platforms/java/android-sample/test.py | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script-no-wrapper/test.py b/java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script-no-wrapper/test.py index ab8845cbd73..c7ab7e66a27 100644 --- a/java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script-no-wrapper/test.py +++ b/java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script-no-wrapper/test.py @@ -2,4 +2,9 @@ import sys from create_database_utils import * +if "JAVA_HOME_11_X64" in os.environ: + os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"] + sep = ";" if platform.system() == "Windows" else ":" + os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]]) + run_codeql_database_create([], lang="java") diff --git a/java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script/test.py b/java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script/test.py index ab8845cbd73..c7ab7e66a27 100644 --- a/java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script/test.py +++ b/java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script/test.py @@ -2,4 +2,9 @@ import sys from create_database_utils import * +if "JAVA_HOME_11_X64" in os.environ: + os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"] + sep = ";" if platform.system() == "Windows" else ":" + os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]]) + run_codeql_database_create([], lang="java") diff --git a/java/ql/integration-tests/all-platforms/java/android-sample-no-wrapper/test.py b/java/ql/integration-tests/all-platforms/java/android-sample-no-wrapper/test.py index ab8845cbd73..c7ab7e66a27 100644 --- a/java/ql/integration-tests/all-platforms/java/android-sample-no-wrapper/test.py +++ b/java/ql/integration-tests/all-platforms/java/android-sample-no-wrapper/test.py @@ -2,4 +2,9 @@ import sys from create_database_utils import * +if "JAVA_HOME_11_X64" in os.environ: + os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"] + sep = ";" if platform.system() == "Windows" else ":" + os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]]) + run_codeql_database_create([], lang="java") diff --git a/java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py b/java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py index ab8845cbd73..c7ab7e66a27 100644 --- a/java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py +++ b/java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py @@ -2,4 +2,9 @@ import sys from create_database_utils import * +if "JAVA_HOME_11_X64" in os.environ: + os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"] + sep = ";" if platform.system() == "Windows" else ":" + os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]]) + run_codeql_database_create([], lang="java") diff --git a/java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script/test.py b/java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script/test.py index ab8845cbd73..c7ab7e66a27 100644 --- a/java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script/test.py +++ b/java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script/test.py @@ -2,4 +2,9 @@ import sys from create_database_utils import * +if "JAVA_HOME_11_X64" in os.environ: + os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"] + sep = ";" if platform.system() == "Windows" else ":" + os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]]) + run_codeql_database_create([], lang="java") diff --git a/java/ql/integration-tests/all-platforms/java/android-sample-old-style-no-wrapper/test.py b/java/ql/integration-tests/all-platforms/java/android-sample-old-style-no-wrapper/test.py index ab8845cbd73..c7ab7e66a27 100644 --- a/java/ql/integration-tests/all-platforms/java/android-sample-old-style-no-wrapper/test.py +++ b/java/ql/integration-tests/all-platforms/java/android-sample-old-style-no-wrapper/test.py @@ -2,4 +2,9 @@ import sys from create_database_utils import * +if "JAVA_HOME_11_X64" in os.environ: + os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"] + sep = ";" if platform.system() == "Windows" else ":" + os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]]) + run_codeql_database_create([], lang="java") diff --git a/java/ql/integration-tests/all-platforms/java/android-sample-old-style/test.py b/java/ql/integration-tests/all-platforms/java/android-sample-old-style/test.py index ab8845cbd73..c7ab7e66a27 100644 --- a/java/ql/integration-tests/all-platforms/java/android-sample-old-style/test.py +++ b/java/ql/integration-tests/all-platforms/java/android-sample-old-style/test.py @@ -2,4 +2,9 @@ import sys from create_database_utils import * +if "JAVA_HOME_11_X64" in os.environ: + os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"] + sep = ";" if platform.system() == "Windows" else ":" + os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]]) + run_codeql_database_create([], lang="java") diff --git a/java/ql/integration-tests/all-platforms/java/android-sample/test.py b/java/ql/integration-tests/all-platforms/java/android-sample/test.py index ab8845cbd73..c7ab7e66a27 100644 --- a/java/ql/integration-tests/all-platforms/java/android-sample/test.py +++ b/java/ql/integration-tests/all-platforms/java/android-sample/test.py @@ -2,4 +2,9 @@ import sys from create_database_utils import * +if "JAVA_HOME_11_X64" in os.environ: + os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"] + sep = ";" if platform.system() == "Windows" else ":" + os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]]) + run_codeql_database_create([], lang="java")