diff options
| author | fanquake <fanquake@gmail.com> | 2023-06-12 09:49:02 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-06-12 09:49:08 +0100 |
| commit | 62140b5e10781d8108bfcc0972f9ed215e13b0a2 (patch) | |
| tree | a6bb80a4a4ca1742e885d3be892ed106aa71a56e | |
| parent | 153a6882f42fff3fdc63bf770d4c86a62c46c448 (diff) | |
| parent | fa22538e481fa2c4f0b5d6f91166335e60b67fe9 (diff) | |
Merge bitcoin/bitcoin#27834: ci: Nuke Android APK task, Use credits for tsan
fa22538e481fa2c4f0b5d6f91166335e60b67fe9 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 fa22538e481fa2c4f0b5d6f91166335e60b67fe9 - nuke it
glozow:
ACK fa22538e481fa2c4f0b5d6f91166335e60b67fe9
Tree-SHA512: e2aa1bd2d0288a769d48412d00cef50d385dca86c1090ba2155f4776da69f34f5b2735b33526bbf845f33f4b55677578c7680f16ef67218b6f73b17d4be7c836
| -rw-r--r-- | .cirrus.yml | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 6af5638f8f..3090deef78 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -248,6 +248,7 @@ task: docker_arguments: CI_IMAGE_NAME_TAG: ubuntu:lunar FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" + << : *CREDITS_TEMPLATE env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV @@ -348,21 +349,3 @@ task: CI_USE_APT_INSTALL: "no" PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh" - -task: - name: 'ARM64 Android APK [jammy]' - << : *CONTAINER_DEPENDS_TEMPLATE - container: - docker_arguments: - CI_IMAGE_NAME_TAG: ubuntu:jammy - FILE_ENV: "./ci/test/00_setup_env_android.sh" - << : *CREDITS_TEMPLATE - android_sdk_cache: - folder: "depends/SDKs/android" - fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313" - depends_sources_cache: - folder: "depends/sources" - fingerprint_script: git rev-parse HEAD:depends/packages - << : *MAIN_TEMPLATE - env: - << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV |