Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-28 13:02:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#27063: ci: Use the latest Ubuntu LTS for "ARM64 Android APK" task

Browse Source 
887bb53b67 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 887bb53b67 - 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
This commit is contained in:
merge-script 2023-02-09 10:44:48 +01:00
commit dc905f6c2a
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cirrus.yml
View File

@ -333,7 +333,7 @@ task:
FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh" FILE_ENV: "./ci/test/00_setup_env_mac_native_arm64.sh"
task: task:
name: 'ARM64 Android APK [focal]' name: 'ARM64 Android APK [jammy]'
<< : *BASE_TEMPLATE << : *BASE_TEMPLATE
android_sdk_cache: android_sdk_cache:
folder: "depends/SDKs/android" folder: "depends/SDKs/android"
@ -343,7 +343,7 @@ task:
fingerprint_script: git rev-list -1 HEAD ./depends fingerprint_script: git rev-list -1 HEAD ./depends
<< : *MAIN_TEMPLATE << : *MAIN_TEMPLATE
container: container:
image: ubuntu:focal image: ubuntu:jammy
env: env:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
FILE_ENV: "./ci/test/00_setup_env_android.sh" FILE_ENV: "./ci/test/00_setup_env_android.sh"

2
ci/test/00_setup_env_android.sh
View File

@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
export HOST=aarch64-linux-android export HOST=aarch64-linux-android
export PACKAGES="unzip openjdk-8-jdk gradle" export PACKAGES="unzip openjdk-8-jdk gradle"
export CONTAINER_NAME=ci_android 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_UNIT_TESTS=false
export RUN_FUNCTIONAL_TESTS=false export RUN_FUNCTIONAL_TESTS=false