diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-03-28 13:50:18 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-03-28 20:05:46 +0200 |
| commit | fa97a17ac332d2270f80497d5660665e88ea621c (patch) | |
| tree | 7500368b743164b70f1a9737d72e55698ff35599 | |
| parent | fac577d42330e57c17540cabdb8be43c90b715d9 (diff) | |
| download | bitcoin-fa97a17ac332d2270f80497d5660665e88ea621c.tar.xz | |
ci: Bump Android cross-build to Ubuntu Focal
This does not change behavior, but bumping to Focal now means it doesn't
have to be done later when Bionic is no longer used and EOL.
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | ci/test/00_setup_env_android.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index e881e587bf..ae49843db1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -182,9 +182,9 @@ task: FILE_ENV: "./ci/test/00_setup_env_mac_host.sh" task: - name: 'ARM64 Android APK [bionic]' + name: 'ARM64 Android APK [focal]' << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:bionic + image: ubuntu:focal 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 f4239b4ef3..f78a84eeac 100644 --- 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="clang llvm unzip openjdk-8-jdk gradle" export CONTAINER_NAME=ci_android -export DOCKER_NAME_TAG="ubuntu:bionic" +export DOCKER_NAME_TAG="ubuntu:focal" export RUN_UNIT_TESTS=false export RUN_FUNCTIONAL_TESTS=false |