Skip to content

Gate remaining Android integration tests off linux-arm64 #22334

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
redsun82 merged 2 commits into from
Aug 13, 2026
+10 −0
Merged

Gate remaining Android integration tests off linux-arm64 #22334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4321ba1
Gate remaining Android integration tests off linux-arm64
redsun82 Aug 13, 2026
2c67a08
Make android-gradle-incompatibility gating comment self-contained
redsun82 Aug 13, 2026
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
5 changes: 5 additions & 0 deletions java/ql/integration-tests/java/android-8-sample/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import runs_on


# Put Java 11 on the path so as to challenge our version selection logic: Java 11 is unsuitable for Android Gradle Plugin 8+,
# so it will be necessary to notice Java 17 available in the environment and actively select it.
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
@(runs_on.x86_64 or runs_on.macos)
def test(codeql, use_java_11, java, gradle_8_0, android_sdk):
codeql.database.create()
5 changes: 5 additions & 0 deletions java/ql/integration-tests/java/diagnostics/android-gradle-incompatibility/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
import runs_on


# Deselected on linux-arm64: there the AGP build fails because no linux-aarch64 aapt2 exists, which is unrelated to the AGP/Gradle version incompatibility this test asserts and would otherwise let it pass for the wrong reason.
@(runs_on.x86_64 or runs_on.macos)
def test(codeql, java, gradle_7_3, android_sdk):
codeql.database.create(_assert_failure=True)
Loading