Skip to content

Commit 38726fd

Browse files
authored
Merge pull request #22327 from github/redsun82-gate-android-tests-arm64
Java: gate AGP-7.x Android integration tests off linux-arm64
2 parents 56df417 + d12e9dc commit 38726fd

8 files changed

Lines changed: 40 additions & 0 deletions

File tree

  • java/ql/integration-tests/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
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
import runs_on
2+
3+
4+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_17, java, android_sdk):
27
codeql.database.create()
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
import runs_on
2+
3+
4+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
27
codeql.database.create()
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
import runs_on
2+
3+
4+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_17, java, android_sdk):
27
codeql.database.create()
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
import runs_on
2+
3+
4+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_17, java, android_sdk, actions_toolchains_file):
27
codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
import runs_on
2+
3+
4+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
27
codeql.database.create()
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
import runs_on
2+
3+
4+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_17, java, android_sdk, actions_toolchains_file):
27
codeql.database.create(_env={"LGTM_INDEX_MAVEN_TOOLCHAINS_FILE": str(actions_toolchains_file)})
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
import runs_on
2+
3+
4+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
27
codeql.database.create()
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
import runs_on
2+
3+
4+
# This Android Gradle Plugin version ships no linux-aarch64 aapt2, so the build fails on linux-arm64 (macOS arm64 works).
5+
@(runs_on.x86_64 or runs_on.macos)
16
def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
27
codeql.database.create()

0 commit comments

Comments
 (0)