ci: Only cache depends/sdk-sources for macos/apk task in cirrus #21675

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2104-ciSdkMacosOnly changing 1 files +6 −2

MarcoFalke commented at 6:32 AM on April 14, 2021: member

Only macos needs the sdk-sources, so move it there (and remove it from showing up in the other tasks)
in .cirrus.yml:182 in fa49cd7183 outdated
```
 175 | @@ -178,6 +176,8 @@ task:
 176 |  
 177 |  task:
 178 |    name: 'macOS 10.14 [gui, no tests] [focal]'
```
jarolrod commented at 6:49 AM on April 14, 2021:

why only under macOS 10.14, shouldn't it be added to the macOS 11 task as well?

edit: sorry my mistake, the macOS 11 task is "no depends"

MarcoFalke commented at 7:17 AM on April 14, 2021:

Jup it is "native" (an actual mac compiling), not a cross-compile with depends
jarolrod commented at 6:51 AM on April 14, 2021: member

concept ACK, makes sense 👍
hebasto commented at 6:55 AM on April 14, 2021: member

Concept ACK, that was in my todo list :)

Only macos needs the sdk-sources...

https://github.com/bitcoin/bitcoin/blob/e7af2f35af95f4ca51e38c8ac5b05cad8be22489/ci/test/05_before_script.sh#L26
DrahtBot added the label Tests on Apr 14, 2021
MarcoFalke renamed this:
~~ci: Only cache depends/sdk-sources for macos task in cirrus~~
ci: Only cache depends/sdk-sources for macos/apk task in cirrus
on Apr 14, 2021
MarcoFalke force-pushed on Apr 14, 2021
MarcoFalke commented at 7:08 AM on April 14, 2021: member

Good catch. Fixed.
hebasto commented at 7:09 AM on April 14, 2021: member

Maybe a named template?
ci: Only cache depends/sdk-sources for macos/apk task in cirrus 11115c8ee5
MarcoFalke force-pushed on Apr 14, 2021
MarcoFalke commented at 7:16 AM on April 14, 2021: member

Thanks, done
hebasto approved

hebasto commented at 7:29 AM on April 14, 2021: member

ACK 11115c8ee5d628f301c3f9a1ffe3afe37ac831fd

nit: It seems convenient if the merge_base script follows immediately after cloning:

--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -180,8 +180,8 @@ task:
 
 task:
   name: 'macOS 10.14 [gui, no tests] [focal]'
-  << : *DEPENDS_SDK_CACHE_TEMPLATE
   << : *GLOBAL_TASK_TEMPLATE
+  << : *DEPENDS_SDK_CACHE_TEMPLATE
   container:
     image: ubuntu:focal
   env:
@@ -205,10 +205,10 @@ task:
 
 task:
   name: 'ARM64 Android APK [focal]'
+  << : *GLOBAL_TASK_TEMPLATE
   << : *DEPENDS_SDK_CACHE_TEMPLATE
   depends_sources_cache:
     folder: "depends/sources"
-  << : *GLOBAL_TASK_TEMPLATE
   container:
     image: ubuntu:focal
   env:

MarcoFalke commented at 7:33 AM on April 14, 2021: member

Your patch would reintroduce bug #21653
hebasto commented at 7:35 AM on April 14, 2021: member

Your patch would reintroduce bug #21653

Right. :facepalm:
MarcoFalke merged this on Apr 14, 2021
MarcoFalke closed this on Apr 14, 2021
MarcoFalke deleted the branch on Apr 14, 2021
sidhujag referenced this in commit 9b2bf09529 on Apr 14, 2021
DrahtBot locked this on Aug 18, 2022

Contributors

Labels