Skip to content

Commit f0e4449

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#25530: ci: apply cache size limit and print ccache statistics in "ARM64 Android APK" task
31346a3 [ci] apply cache size limit and print ccache statistics in "ARM64 Android APK" (sogoagain) Pull request description: Fixes bitcoin/bitcoin#25475 Modified `ci/test/06_script_a.sh` file to apply cache size limit and print ccahce statistics in "ARM64 Android APK" task. Please feel free to give me any feedback. Thanks. ACKs for top commit: hebasto: ACK 31346a3, my previous [comment](bitcoin/bitcoin#25530 (comment)) can be considered as a suggestion for a follow up. Tree-SHA512: 1204fe78f90a34f0c74f256309626c6bbba0848e5f7c632ee2ca96529dc7243eb7282d83bab6c960b0c9f6ee21a49528b40c45be1e3da5958e2db83f4c00a1d2
2 parents 9c55091 + 31346a3 commit f0e4449

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ci/test/06_script_a.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,19 @@ if [ -z "$NO_WERROR" ]; then
1111
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
1212
fi
1313

14+
CI_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
15+
PRINT_CCACHE_STATISTICS="ccache --version | head -n 1 && ccache --show-stats"
16+
1417
if [ -n "$ANDROID_TOOLS_URL" ]; then
1518
CI_EXEC make distclean || true
1619
CI_EXEC ./autogen.sh
1720
CI_EXEC ./configure "$BITCOIN_CONFIG_ALL" "$BITCOIN_CONFIG" || ( (CI_EXEC cat config.log) && false)
1821
CI_EXEC "make $MAKEJOBS && cd src/qt && ANDROID_HOME=${ANDROID_HOME} ANDROID_NDK_HOME=${ANDROID_NDK_HOME} make apk"
22+
CI_EXEC "${PRINT_CCACHE_STATISTICS}"
1923
exit 0
2024
fi
2125

2226
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-external-signer --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
23-
CI_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
2427

2528
if [ -n "$CONFIG_SHELL" ]; then
2629
CI_EXEC "$CONFIG_SHELL" -c "./autogen.sh"
@@ -57,6 +60,6 @@ fi
5760

5861
CI_EXEC "${MAYBE_BEAR}" "${MAYBE_TOKEN}" make "$MAKEJOBS" "$GOAL" || ( echo "Build failure. Verbose build follows." && CI_EXEC make "$GOAL" V=1 ; false )
5962

60-
CI_EXEC "ccache --version | head -n 1 && ccache --show-stats"
63+
CI_EXEC "${PRINT_CCACHE_STATISTICS}"
6164
CI_EXEC du -sh "${DEPENDS_DIR}"/*/
6265
CI_EXEC du -sh "${PREVIOUS_RELEASES_DIR}"

0 commit comments

Comments
 (0)