Skip to content

Commit

Permalink
Merge #27070: ci: Fix fingerprint_script for depends subdir caches
Browse files Browse the repository at this point in the history
d66efa3 ci: Fix `fingerprint_script` for `depends` subdir caches (Hennadii Stepanov)

Pull request description:

  #26977 made current `git rev-list -1 HEAD ./depends` [not working](#26977 (comment)).

  This PR fixes this issue with an idea from #26977 (comment).

ACKs for top commit:
  MarcoFalke:
    lgtm ACK d66efa3

Tree-SHA512: e6dbb1a80439bf8c044e50afc44b8b08b0903d20da5ef9dcbb265f2d64b6810ea5f4cb8abb44e00b96673082f1dbdd350627627d9d28f362bdb662c92ef257d8
  • Loading branch information
bitcoin-core-merge-script committed Feb 10, 2023
2 parents ffdf630 + d66efa3 commit 4f841cb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4f841cb

Please sign in to comment.