Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4197d7b

Browse files
smowtonsmowton
committed
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.
1 parent b6df415 commit 4197d7b

8 files changed

Lines changed: 40 additions & 0 deletions

File tree

  • java/ql/integration-tests/all-platforms/java
    • android-sample-kotlin-build-script-no-wrapper
    • android-sample-kotlin-build-script
    • android-sample-no-wrapper
    • android-sample-old-style-kotlin-build-script-no-wrapper
    • android-sample-old-style-kotlin-build-script
    • android-sample-old-style-no-wrapper
    • android-sample-old-style
    • android-sample

‎java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script-no-wrapper/test.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
from create_database_utils import *
44

5+
if "JAVA_HOME_11_X64" in os.environ:
6+
os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
7+
sep = ";" if platform.system() == "Windows" else ":"
8+
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
9+
510
run_codeql_database_create([], lang="java")

‎java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script/test.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
from create_database_utils import *
44

5+
if "JAVA_HOME_11_X64" in os.environ:
6+
os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
7+
sep = ";" if platform.system() == "Windows" else ":"
8+
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
9+
510
run_codeql_database_create([], lang="java")

‎java/ql/integration-tests/all-platforms/java/android-sample-no-wrapper/test.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
from create_database_utils import *
44

5+
if "JAVA_HOME_11_X64" in os.environ:
6+
os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
7+
sep = ";" if platform.system() == "Windows" else ":"
8+
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
9+
510
run_codeql_database_create([], lang="java")

‎java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
from create_database_utils import *
44

5+
if "JAVA_HOME_11_X64" in os.environ:
6+
os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
7+
sep = ";" if platform.system() == "Windows" else ":"
8+
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
9+
510
run_codeql_database_create([], lang="java")

‎java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script/test.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
from create_database_utils import *
44

5+
if "JAVA_HOME_11_X64" in os.environ:
6+
os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
7+
sep = ";" if platform.system() == "Windows" else ":"
8+
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
9+
510
run_codeql_database_create([], lang="java")

‎java/ql/integration-tests/all-platforms/java/android-sample-old-style-no-wrapper/test.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
from create_database_utils import *
44

5+
if "JAVA_HOME_11_X64" in os.environ:
6+
os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
7+
sep = ";" if platform.system() == "Windows" else ":"
8+
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
9+
510
run_codeql_database_create([], lang="java")

‎java/ql/integration-tests/all-platforms/java/android-sample-old-style/test.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
from create_database_utils import *
44

5+
if "JAVA_HOME_11_X64" in os.environ:
6+
os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
7+
sep = ";" if platform.system() == "Windows" else ":"
8+
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
9+
510
run_codeql_database_create([], lang="java")

‎java/ql/integration-tests/all-platforms/java/android-sample/test.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22

33
from create_database_utils import *
44

5+
if "JAVA_HOME_11_X64" in os.environ:
6+
os.environ["JAVA_HOME"] = os.environ["JAVA_HOME_11_X64"]
7+
sep = ";" if platform.system() == "Windows" else ":"
8+
os.environ["PATH"] = "".join([os.path.join(os.environ["JAVA_HOME"], "bin"), sep, os.environ["PATH"]])
9+
510
run_codeql_database_create([], lang="java")

0 commit comments

Comments
 (0)