Skip to content

Commit 47c5a35

Browse files
authored
Add Cirrus macOS as a runner that supports building for Android but not testing (#2514)
* Add Cirrus macOS as a runner that supports building for Android but not testing * Try to trigger Cirrus by changing .cirrus.yml
1 parent e6de07e commit 47c5a35

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ linux_aarch64_task:
4646
<<: *RUN_TESTS
4747

4848
windows_x86_task:
49-
# The task takes ~55 minutes while the timeout happens
50-
# after 60 minutes by default, let's allow some wiggle room.
49+
# The task takes ~55 minutes while the timeout happens after 60 minutes by default,
50+
# let's allow some wiggle room.
5151
timeout_in: 120m
5252
windows_container:
5353
image: cirrusci/windowsservercore:visualstudio2022

test/test_android.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@
2828
)
2929

3030
# Detect CI services which have the Android SDK pre-installed.
31-
ci_supports_build = any(
32-
key in os.environ
33-
for key in [
34-
"GITHUB_ACTIONS",
35-
"TF_BUILD", # Azure Pipelines
36-
]
31+
ci_supports_build = (
32+
("CIRRUS_CI" in os.environ and platform.system() == "Darwin")
33+
or "GITHUB_ACTIONS" in os.environ
34+
or "TF_BUILD" in os.environ # Azure Pipelines
3735
)
3836

3937
if "ANDROID_HOME" not in os.environ:

0 commit comments

Comments
 (0)