Skip to content

Commit dc905f6

Browse files
Merge bitcoin/bitcoin#27063: ci: Use the latest Ubuntu LTS for "ARM64 Android APK" task
887bb53 ci: Use the latest Ubuntu LTS for "ARM64 Android APK" task (Hennadii Stepanov) Pull request description: Suggested in bitcoin/bitcoin#25797 (comment): > 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 887bb53 - 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
2 parents 835af48 + 887bb53 commit dc905f6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ task:
333333
FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh"
334334

335335
task:
336-
name: 'ARM64 Android APK [focal]'
336+
name: 'ARM64 Android APK [jammy]'
337337
<< : *BASE_TEMPLATE
338338
android_sdk_cache:
339339
folder: "depends/SDKs/android"
@@ -343,7 +343,7 @@ task:
343343
fingerprint_script: git rev-list -1 HEAD ./depends
344344
<< : *MAIN_TEMPLATE
345345
container:
346-
image: ubuntu:focal
346+
image: ubuntu:jammy
347347
env:
348348
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
349349
FILE_ENV: "./ci/test/00_setup_env_android.sh"

ci/test/00_setup_env_android.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
99
export HOST=aarch64-linux-android
1010
export PACKAGES="unzip openjdk-8-jdk gradle"
1111
export CONTAINER_NAME=ci_android
12-
export CI_IMAGE_NAME_TAG="ubuntu:focal"
12+
export CI_IMAGE_NAME_TAG="ubuntu:jammy"
1313

1414
export RUN_UNIT_TESTS=false
1515
export RUN_FUNCTIONAL_TESTS=false

0 commit comments

Comments
 (0)