Skip to content

Commit 447f867

Browse files
author
MarcoFalke
committed
Merge #18667: ci: Limit cache size regardless of NO_DEPENDS
0c63187 ci: Limit cache size regardless of NO_DEPENDS (Hennadii Stepanov) Pull request description: Close #18666. ACKs for top commit: MarcoFalke: ACK 0c63187 . Depends has ccache disabled anyway and is cached regardless of whether ccache is there or not, see #17248 Tree-SHA512: b1bf98be0f844b4704abd177841b014f3900be8160496f0d12596310db607b4f544547e8c3cbfcf17c086a78afd251653363f3dd467b769ac0062bc19adc8144
2 parents d8dfcea + 0c63187 commit 447f867

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

ci/test/06_script_a.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
10-
DOCKER_EXEC "command -v ccache > /dev/null && ccache --zero-stats"
11-
if [ -z "$NO_DEPENDS" ]; then
12-
DOCKER_EXEC ccache --max-size=$CCACHE_SIZE
13-
fi
10+
DOCKER_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
1411

1512
BEGIN_FOLD autogen
1613
if [ -n "$CONFIG_SHELL" ]; then
@@ -47,5 +44,5 @@ DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows
4744
END_FOLD
4845

4946
BEGIN_FOLD ccache_stats
50-
DOCKER_EXEC "command -v ccache > /dev/null && ccache --version | head -n 1 && ccache --show-stats"
47+
DOCKER_EXEC "ccache --version | head -n 1 && ccache --show-stats"
5148
END_FOLD

0 commit comments

Comments
 (0)