From d66efa30cdd84a11348fd6a3a9f0b3f89a5345ff Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Thu, 9 Feb 2023 22:20:42 +0000 Subject: [PATCH] ci: Fix `fingerprint_script` for `depends` subdir caches --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 232b24117aefb..673bc427e162f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -49,7 +49,7 @@ container_depends_template: &CONTAINER_DEPENDS_TEMPLATE memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers depends_built_cache: folder: "depends/built" - fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends) + fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-parse HEAD:depends) global_task_template: &GLOBAL_TASK_TEMPLATE << : *CONTAINER_DEPENDS_TEMPLATE @@ -342,7 +342,7 @@ task: fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313" depends_sources_cache: folder: "depends/sources" - fingerprint_script: git rev-list -1 HEAD ./depends + fingerprint_script: git rev-parse HEAD:depends/packages << : *MAIN_TEMPLATE env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV