Skip to content

Commit 62140b5

Browse files
committed
Merge bitcoin/bitcoin#27834: ci: Nuke Android APK task, Use credits for tsan
fa22538 ci: Nuke Android APK task, Use credits for tsan (MarcoFalke) Pull request description: The Android task has many issues: * It runs into more network timeouts (intermittent failures) than other tasks * It never failed since its introduction years ago in a scenario where all other tasks passed, thus it is useless (so far) Fix all issues by removing the task. Note that the CI env file is kept, so anyone can still run the Android CI. Also, use the compute credits to promote tsan, a more useful task. ACKs for top commit: dergoegge: ACK fa22538 - nuke it glozow: ACK fa22538 Tree-SHA512: e2aa1bd2d0288a769d48412d00cef50d385dca86c1090ba2155f4776da69f34f5b2735b33526bbf845f33f4b55677578c7680f16ef67218b6f73b17d4be7c836
2 parents 153a688 + fa22538 commit 62140b5

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

.cirrus.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ task:
248248
docker_arguments:
249249
CI_IMAGE_NAME_TAG: ubuntu:lunar
250250
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
251+
<< : *CREDITS_TEMPLATE
251252
env:
252253
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
253254

@@ -348,21 +349,3 @@ task:
348349
CI_USE_APT_INSTALL: "no"
349350
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
350351
FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh"
351-
352-
task:
353-
name: 'ARM64 Android APK [jammy]'
354-
<< : *CONTAINER_DEPENDS_TEMPLATE
355-
container:
356-
docker_arguments:
357-
CI_IMAGE_NAME_TAG: ubuntu:jammy
358-
FILE_ENV: "./ci/test/00_setup_env_android.sh"
359-
<< : *CREDITS_TEMPLATE
360-
android_sdk_cache:
361-
folder: "depends/SDKs/android"
362-
fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313"
363-
depends_sources_cache:
364-
folder: "depends/sources"
365-
fingerprint_script: git rev-parse HEAD:depends/packages
366-
<< : *MAIN_TEMPLATE
367-
env:
368-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

0 commit comments

Comments
 (0)