ci: Re-introduce `depends_built` cache back in macOS and Android tasks

hebasto commented at 12:24 pm on February 8, 2023: member

This PR brings a depends_built cache back to the “macOS 10.15” and “ARM64 Android APK” CI tasks.

Fixes #27031.

DrahtBot commented at 12:24 pm on February 8, 2023: contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	MarcoFalke

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#25797 (build: Add CMake-based build system by hebasto)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

DrahtBot added the label Tests on Feb 8, 2023

hebasto force-pushed on Feb 8, 2023

hebasto renamed this:
~~ci: Use `GLOBAL_TASK_TEMPLATE` in "macOS 10.15" task~~
ci: Re-introduce `depends_built` cache` back in "macOS 10.15" task
on Feb 8, 2023

hebasto renamed this:
~~ci: Re-introduce `depends_built` cache` back in "macOS 10.15" task~~
ci: Re-introduce `depends_built` cache back in "macOS 10.15" task
on Feb 8, 2023

hebasto commented at 12:33 pm on February 8, 2023: member

Updated commit message.

maflcko commented at 12:35 pm on February 8, 2023: member

When was this introduced?

in .cirrus.yml:58 in f6b4bedf39 outdated

49@@ -50,6 +50,9 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
50   depends_built_cache:
51     folder: "depends/built"
52     fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
53+
54+global_task_template: &GLOBAL_TASK_TEMPLATE
55+  << : *CONTAINER_DEPENDS_TEMPLATE
56   << : *MAIN_TEMPLATE
57 
58 macos_native_task_template: &MACOS_NATIVE_TASK_TEMPLATE

maflcko commented at 12:35 pm on February 8, 2023:

unrelated: What is the point of a template that is only used once? We don’t have a template for windows either.

hebasto commented at 12:37 pm on February 8, 2023:

There is no point now. The initial idea was to re-use it with two Apple tasks: x86_64 and arm64.

maflcko commented at 10:13 am on February 9, 2023:

nit: Mind inlining it here?

maflcko commented at 10:13 am on February 9, 2023:

(in a new commit)

hebasto commented at 10:32 am on February 9, 2023:

nit: Mind inlining it here?

(in a new commit)

Done.

hebasto commented at 12:54 pm on February 8, 2023: member

When was this introduced?

8e017f32889e9536a436f40c91f34f24bfd10525 :man_facepalming:

hebasto force-pushed on Feb 9, 2023

in .cirrus.yml:315 in ffac7397b6 outdated

321   << : *MAIN_TEMPLATE
322-  container:
323-    image: ubuntu:focal
324   env:
325     MACOS_SDK: "Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers"
326     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

maflcko commented at 12:04 pm on February 9, 2023:

first commit: Isn’t the same diff needed by the android task?

hebasto commented at 12:13 pm on February 9, 2023:

Thanks! Added.

maflcko commented at 12:05 pm on February 9, 2023: member

review ACK 8f8e54277d785b287fb062687bd349a36e1b4e9e 🎻

Signature:

 0-----BEGIN PGP SIGNED MESSAGE-----
 1Hash: SHA512
 2
 3review ACK 8f8e54277d785b287fb062687bd349a36e1b4e9e 🎻
 4-----BEGIN PGP SIGNATURE-----
 5
 6iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
 7pUg2eQv9FCHMLyuAZb9kfKbMHDJ92ahmj9UFic+G8MLGEVDLtMEeYzb8KAIvWQ2k
 81oP7KqqyAR3DgjMUcT6T/ltOLLCp3fnjM4AC0qc/tNdacuMsWqU1bm8SSkqDiGHZ
 9LYOXSS97kXNpK5E+iLsM1oAoPK1gWiD2scgXvKlm1w1AS9TFOlA13llZ0NbLJmar
10IB1NeZO9M6a5cHKaf2+b5sAcHET5414CPo/LrX9rh3Rjbw19aYR95CKYh+mmHaMv
115Zd38CxFk4xS9DYmVcJUWbcn1d1MmhLECcoIE2gbc1rTnRRwDWwAqAlbUAwb0Zz2
12svATwALVpvLiAVtsbQf56YhutkTvLhUOmQC0nvgBn2f0FPGV8xEjFlWOaxvRol+c
13Pw5FAqA37NItPbSJ5pL+rjGSDoQF+OXlkJBPcFR40AykcMPhNiBx6jjLxxug+EAd
14ZCUZVaWip+QOokpptph2mK+fXP4nhMs+NU4CwgSmjpnqShDQKXj2NLnc2KXTrFQB
15hu5plVPg
16=WrCO
17-----END PGP SIGNATURE-----

ci: Re-introduce `depends_built` cache back in macOS and Android tasks 8a61527cf6

ci: Inline `MACOS_NATIVE_TASK_TEMPLATE` 73a3b161b7

hebasto force-pushed on Feb 9, 2023

hebasto renamed this:
~~ci: Re-introduce `depends_built` cache back in "macOS 10.15" task~~
ci: Re-introduce `depends_built` cache back in macOS and Android tasks
on Feb 9, 2023

maflcko commented at 6:05 pm on February 9, 2023: member

reACK 73a3b161b7bb29327d0a529235cdc7d0295bd316 🌻

Signature:

 0-----BEGIN PGP SIGNED MESSAGE-----
 1Hash: SHA512
 2
 3reACK 73a3b161b7bb29327d0a529235cdc7d0295bd316 🌻
 4-----BEGIN PGP SIGNATURE-----
 5
 6iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
 7pUgnZgv/X6udSTPkbxpaHa7QNtPX8PjpqxGD689K6jYOOoq6ev9/CY0wjGqP85ZI
 81H1UNU894lhUhOIoCZFGPWyiQD3g/OXkD3t0VDgMfVe2tpVPO2Yv79IQVH4og0GK
 9Ly0NjJMy31IofHIhzdTyhuvITxsy8Te3lCAZ/8ggvmFpfZsVAzWUT5umj0HjDdSB
10O7zIUX6jm/CgI0fVvZvlpwixAl8M8PtkFBewbX8y9ZFU0g/cS8XpIqTb7Ejxwo2B
11osxdv8gY3d4ixXraoc22WLeDOcwm2f7T7QFy3IREubAGHmJyZv6RZzDY73evL0u7
127kHZC8GOIEDp36YNIGk/4rlY2l1PtCOQ/CGM/EPMSeaASRUB6yPZbhsOMBPYFS9F
13HO4FmGgDg+4DvzBvkPqMfrv+hhinOE4F2QnxcsZ9yTaeOs13o7M3xbsrcj7pTJp5
14cFWnc+N/J40uw5zP/Hcn56iY6gA4oK2v8BPBWF2rXvkS5iS9rewsq08a9VI/RWxA
15CB+13z10
16=4OfT
17-----END PGP SIGNATURE-----

maflcko merged this on Feb 9, 2023

maflcko closed this on Feb 9, 2023

hebasto deleted the branch on Feb 9, 2023

in .cirrus.yml:42 in 73a3b161b7

38@@ -39,7 +39,7 @@ main_template: &MAIN_TEMPLATE
39   ci_script:
40     - ./ci/test_run_all.sh
41 
42-global_task_template: &GLOBAL_TASK_TEMPLATE
43+container_depends_template: &CONTAINER_DEPENDS_TEMPLATE

maflcko commented at 6:41 pm on February 9, 2023:

Any reason to add a new template when the existing can be used? (Untested diff):

 0diff --git a/.cirrus.yml b/.cirrus.yml
 1index 232b24117a..9367d50f6b 100644
 2--- a/.cirrus.yml
 3+++ b/.cirrus.yml
 4@@ -39,7 +39,7 @@ main_template: &MAIN_TEMPLATE
 5   ci_script:
 6     - ./ci/test_run_all.sh
 7 
 8-container_depends_template: &CONTAINER_DEPENDS_TEMPLATE
 9+global_task_template: &GLOBAL_TASK_TEMPLATE
10   << : *BASE_TEMPLATE
11   container:
12     # https://cirrus-ci.org/faq/#are-there-any-limits
13@@ -50,9 +50,6 @@ container_depends_template: &CONTAINER_DEPENDS_TEMPLATE
14   depends_built_cache:
15     folder: "depends/built"
16     fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
17-
18-global_task_template: &GLOBAL_TASK_TEMPLATE
19-  << : *CONTAINER_DEPENDS_TEMPLATE
20   << : *MAIN_TEMPLATE
21 
22 compute_credits_template: &CREDITS_TEMPLATE
23@@ -303,13 +300,12 @@ task:
24 
25 task:
26   name: 'macOS 10.15 [gui, no tests] [focal]'
27-  << : *CONTAINER_DEPENDS_TEMPLATE
28-  container:
29-    image: ubuntu:focal
30   macos_sdk_cache:
31     folder: "depends/SDKs/$MACOS_SDK"
32     fingerprint_key: "$MACOS_SDK"
33-  << : *MAIN_TEMPLATE
34+  << : *GLOBAL_TASK_TEMPLATE
35+  container:
36+    image: ubuntu:focal
37   env:
38     MACOS_SDK: "Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers"
39     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
40@@ -334,16 +330,15 @@ task:
41 
42 task:
43   name: 'ARM64 Android APK [jammy]'
44-  << : *CONTAINER_DEPENDS_TEMPLATE
45-  container:
46-    image: ubuntu:jammy
47   android_sdk_cache:
48     folder: "depends/SDKs/android"
49     fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313"
50   depends_sources_cache:
51     folder: "depends/sources"
52     fingerprint_script: git rev-list -1 HEAD ./depends
53-  << : *MAIN_TEMPLATE
54+  << : *GLOBAL_TASK_TEMPLATE
55+  container:
56+    image: ubuntu:jammy
57   env:
58     << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
59     FILE_ENV: "./ci/test/00_setup_env_android.sh"

hebasto commented at 6:57 pm on February 9, 2023:

Untested diff

It looks correct and elegant.

sidhujag referenced this in commit aa8cb5e99f on Feb 10, 2023

bitcoin locked this on Feb 9, 2024

ci: Re-introduce depends_built cache back in macOS and Android tasks #27062

Reviews

Conflicts

ci: Re-introduce `depends_built` cache back in macOS and Android tasks #27062