diff options
| author | merge-script <90386131+bitcoin-core-merge-script@users.noreply.github.com> | 2023-02-09 10:44:48 +0100 |
|---|---|---|
| committer | merge-script <90386131+bitcoin-core-merge-script@users.noreply.github.com> | 2023-02-09 10:44:48 +0100 |
| commit | dc905f6c2a60961aee73578fd3092bf90b28409f (patch) | |
| tree | 417cc7ec30bee6750f3804e484107eca8252a57f | |
| parent | 835af48e0377d40ffe5839d00b688f65d1554909 (diff) | |
| parent | 887bb53b6748aef5c3a53a7764c588c9394c8713 (diff) | |
Merge bitcoin/bitcoin#27063: ci: Use the latest Ubuntu LTS for "ARM64 Android APK" task
887bb53b6748aef5c3a53a7764c588c9394c8713 ci: Use the latest Ubuntu LTS for "ARM64 Android APK" task (Hennadii Stepanov)
Pull request description:
Suggested in https://github.com/bitcoin/bitcoin/pull/25797#discussion_r1100172227:
> I don't expect that anyone is building for android, and if they did, it should be fine to just require the latest Ubuntu LTS, which is Jammy
ACKs for top commit:
fanquake:
ACK 887bb53b6748aef5c3a53a7764c588c9394c8713 - but I'd also suggest we remove this task entirely, and either replacing it with another task, maybe a *BSD, or delegating the resources to other jobs.
Tree-SHA512: 1f4b6155e5bbb8ca3580809c5999e3abf6b15b409d164a719b0a89205ca48c178aa6401039a22151ce464009adc48ba272a5a2ff05dc3ca06d3b2d64c99e3e22
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_android.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 64fcd82c2b..1ff2a46a3f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -333,7 +333,7 @@ task: FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh" task: - name: 'ARM64 Android APK [focal]' + name: 'ARM64 Android APK [jammy]' << : *BASE_TEMPLATE android_sdk_cache: folder: "depends/SDKs/android" @@ -343,7 +343,7 @@ task: fingerprint_script: git rev-list -1 HEAD ./depends << : *MAIN_TEMPLATE container: - image: ubuntu:focal + image: ubuntu:jammy env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV FILE_ENV: "./ci/test/00_setup_env_android.sh" diff --git a/ci/test/00_setup_env_android.sh b/ci/test/00_setup_env_android.sh index e1830b4f49..1834bd0bc4 100755 --- a/ci/test/00_setup_env_android.sh +++ b/ci/test/00_setup_env_android.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 export HOST=aarch64-linux-android export PACKAGES="unzip openjdk-8-jdk gradle" export CONTAINER_NAME=ci_android -export CI_IMAGE_NAME_TAG="ubuntu:focal" +export CI_IMAGE_NAME_TAG="ubuntu:jammy" export RUN_UNIT_TESTS=false export RUN_FUNCTIONAL_TESTS=false |