Skip to content

Commit 4f841cb

Browse files
Merge bitcoin/bitcoin#27070: ci: Fix fingerprint_script for depends subdir caches
d66efa3 ci: Fix `fingerprint_script` for `depends` subdir caches (Hennadii Stepanov) Pull request description: bitcoin/bitcoin#26977 made current `git rev-list -1 HEAD ./depends` [not working](bitcoin/bitcoin#26977 (comment)). This PR fixes this issue with an idea from bitcoin/bitcoin#26977 (comment). ACKs for top commit: MarcoFalke: lgtm ACK d66efa3 Tree-SHA512: e6dbb1a80439bf8c044e50afc44b8b08b0903d20da5ef9dcbb265f2d64b6810ea5f4cb8abb44e00b96673082f1dbdd350627627d9d28f362bdb662c92ef257d8
2 parents ffdf630 + d66efa3 commit 4f841cb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ container_depends_template: &CONTAINER_DEPENDS_TEMPLATE
4949
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
5050
depends_built_cache:
5151
folder: "depends/built"
52-
fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-list -1 HEAD ./depends)
52+
fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-parse HEAD:depends)
5353

5454
global_task_template: &GLOBAL_TASK_TEMPLATE
5555
<< : *CONTAINER_DEPENDS_TEMPLATE
@@ -342,7 +342,7 @@ task:
342342
fingerprint_key: "ANDROID_API_LEVEL=28 ANDROID_BUILD_TOOLS_VERSION=28.0.3 ANDROID_NDK_VERSION=23.2.8568313"
343343
depends_sources_cache:
344344
folder: "depends/sources"
345-
fingerprint_script: git rev-list -1 HEAD ./depends
345+
fingerprint_script: git rev-parse HEAD:depends/packages
346346
<< : *MAIN_TEMPLATE
347347
env:
348348
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

0 commit comments

Comments
 (0)