diff options
| author | fanquake <fanquake@gmail.com> | 2021-03-29 10:37:25 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-03-29 11:04:55 +0800 |
| commit | de4d3ba43705ea313f92f17295005c371a8d0bd0 (patch) | |
| tree | 139786c9bbe8ca4638d3d00dbfa42b1ccf42664f /.cirrus.yml | |
| parent | c00852653f2bf9cd3ee53ab05d574fe4a9ff6dcc (diff) | |
| parent | fa52d7d3adc99c0e716628058b4fd083034d27e0 (diff) | |
Merge #21541: ci: Build depends only once for Android build
fa52d7d3adc99c0e716628058b4fd083034d27e0 cirrus: Add missing depends_sources_cache to Android task (MarcoFalke)
ffff4e7373f7c1260e6a8347b4ea1a99db4fff76 cirrus: Only cache releases when needed (MarcoFalke)
fa97a17ac332d2270f80497d5660665e88ea621c ci: Bump Android cross-build to Ubuntu Focal (MarcoFalke)
fac577d42330e57c17540cabdb8be43c90b715d9 ci: Build depends only once for Android build (MarcoFalke)
fa908a41f3b86622e4635b3478467e19fa67b571 ci: Set DEPENDS_DIR when setting BASE_ROOT_DIR (MarcoFalke)
Pull request description:
Currently the Android task has several issues:
* It is missing a cache instruction, thus failing the build on Cirrus CI
* It is running the depends build twice
Fix those issues
ACKs for top commit:
ryanofsky:
Code review ACK fa52d7d3adc99c0e716628058b4fd083034d27e0. Only change since last review is adding descriptions and changing new RUN_UNIT_TESTS line from true to false. (I assume that change doesn't do anything because even though prior default was true, it's a cross compiled build and enabling unit tests would have no effect.)
hebasto:
ACK fa52d7d3adc99c0e716628058b4fd083034d27e0, I have reviewed the code and it looks OK, I agree it can be merged after passing CI.
Tree-SHA512: ae7c68e357068176a0e58285b83521353321c65862cee4ff56f413c51b00398062f0ee6775bfbbf28fda420cf5a24000a2286fbcf6cc7f3729b7805bc8419726
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index e881e587bf..b3d58461e0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -35,8 +35,6 @@ global_task_template: &GLOBAL_TASK_TEMPLATE folder: "/tmp/cirrus-ci-build/depends/built" depends_sdk_cache: folder: "/tmp/cirrus-ci-build/depends/sdk-sources" - depends_releases_cache: - folder: "/tmp/cirrus-ci-build/releases" ci_script: - ./ci/test_run_all.sh @@ -103,6 +101,8 @@ task: # For faster CI feedback, immediately schedule a task that compiles most modules << : *CREDITS_TEMPLATE << : *GLOBAL_TASK_TEMPLATE + depends_releases_cache: + folder: "/tmp/cirrus-ci-build/releases" container: image: ubuntu:bionic env: @@ -182,9 +182,11 @@ task: FILE_ENV: "./ci/test/00_setup_env_mac_host.sh" task: - name: 'ARM64 Android APK [bionic]' + name: 'ARM64 Android APK [focal]' + depends_sources_cache: + folder: "/tmp/cirrus-ci-build/depends/sources" << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:bionic + image: ubuntu:focal env: FILE_ENV: "./ci/test/00_setup_env_android.sh" |