Let ccache compress the cache by itself instead of compressing ccache.tar (#2456)
The cache can become quite large and uncompressing/recompressing it is slow. Better to let ccache handle compression as it will then only perform it on files which are actually used.
This commit is contained in:
parent
40fa1bb492
commit
614ff70b4c
@ -117,6 +117,8 @@ for(int i = 0; i < targets.size(); i++) {
|
|||||||
archiveArtifacts artifacts: 'dashcore-binaries/*', fingerprint: true
|
archiveArtifacts artifacts: 'dashcore-binaries/*', fingerprint: true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO remove this in a few days (only needed to prune the old compressed file from Jenkins caches)
|
||||||
|
sh "cd gitian-builder/cache && find -name ccache.tar.gz | xargs rm -f"
|
||||||
sh "cd gitian-builder/cache && tar czfv ../../cache-${gitianDescriptor.name}.tar.gz common ${gitianDescriptor.name}"
|
sh "cd gitian-builder/cache && tar czfv ../../cache-${gitianDescriptor.name}.tar.gz common ${gitianDescriptor.name}"
|
||||||
archiveArtifacts artifacts: "cache-${gitianDescriptor.name}.tar.gz", fingerprint: true
|
archiveArtifacts artifacts: "cache-${gitianDescriptor.name}.tar.gz", fingerprint: true
|
||||||
}
|
}
|
||||||
|
@ -61,12 +61,15 @@ script: |
|
|||||||
export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
|
export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
|
||||||
# As we later wrap the gcc binaries, this is fast
|
# As we later wrap the gcc binaries, this is fast
|
||||||
export CCACHE_COMPILERCHECK="content"
|
export CCACHE_COMPILERCHECK="content"
|
||||||
if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar.gz ]; then
|
if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar ]; then
|
||||||
pushd ${GBUILD_PACKAGE_CACHE}
|
pushd ${GBUILD_PACKAGE_CACHE}
|
||||||
tar xzf ccache.tar.gz
|
tar xf ccache.tar
|
||||||
rm ccache.tar.gz
|
rm ccache.tar
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
# instead of compressing ccache.tar, we let ccache handle it by itself
|
||||||
|
# Otherwise we end up uncompressing/compressing a lot of cache files which we actually never use
|
||||||
|
export CCACHE_COMPRESS=1
|
||||||
else
|
else
|
||||||
CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
|
CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
|
||||||
fi
|
fi
|
||||||
@ -212,7 +215,7 @@ script: |
|
|||||||
# Compress ccache (otherwise the assert file will get too huge)
|
# Compress ccache (otherwise the assert file will get too huge)
|
||||||
if [ "$CCACHE_DIR" != "" ]; then
|
if [ "$CCACHE_DIR" != "" ]; then
|
||||||
pushd ${GBUILD_PACKAGE_CACHE}
|
pushd ${GBUILD_PACKAGE_CACHE}
|
||||||
tar czf ccache.tar.gz ccache
|
tar cf ccache.tar ccache
|
||||||
rm -rf ccache
|
rm -rf ccache
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
@ -55,12 +55,15 @@ script: |
|
|||||||
# Setup ccache to use correct cache directories
|
# Setup ccache to use correct cache directories
|
||||||
CONFIGFLAGS="${CONFIGFLAGS} --enable-ccache"
|
CONFIGFLAGS="${CONFIGFLAGS} --enable-ccache"
|
||||||
export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
|
export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
|
||||||
if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar.gz ]; then
|
if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar ]; then
|
||||||
pushd ${GBUILD_PACKAGE_CACHE}
|
pushd ${GBUILD_PACKAGE_CACHE}
|
||||||
tar xzf ccache.tar.gz
|
tar xf ccache.tar
|
||||||
rm ccache.tar.gz
|
rm ccache.tar
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
# instead of compressing ccache.tar, we let ccache handle it by itself
|
||||||
|
# Otherwise we end up uncompressing/compressing a lot of cache files which we actually never use
|
||||||
|
export CCACHE_COMPRESS=1
|
||||||
else
|
else
|
||||||
CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
|
CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
|
||||||
fi
|
fi
|
||||||
@ -176,7 +179,7 @@ script: |
|
|||||||
# Compress ccache (otherwise the assert file will get too huge)
|
# Compress ccache (otherwise the assert file will get too huge)
|
||||||
if [ "$CCACHE_DIR" != "" ]; then
|
if [ "$CCACHE_DIR" != "" ]; then
|
||||||
pushd ${GBUILD_PACKAGE_CACHE}
|
pushd ${GBUILD_PACKAGE_CACHE}
|
||||||
tar czf ccache.tar.gz ccache
|
tar cf ccache.tar ccache
|
||||||
rm -rf ccache
|
rm -rf ccache
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
@ -53,12 +53,15 @@ script: |
|
|||||||
export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
|
export CCACHE_DIR=${GBUILD_PACKAGE_CACHE}/ccache
|
||||||
# As we later wrap the gcc binaries, this is fast
|
# As we later wrap the gcc binaries, this is fast
|
||||||
export CCACHE_COMPILERCHECK="content"
|
export CCACHE_COMPILERCHECK="content"
|
||||||
if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar.gz ]; then
|
if [ -f ${GBUILD_PACKAGE_CACHE}/ccache.tar ]; then
|
||||||
pushd ${GBUILD_PACKAGE_CACHE}
|
pushd ${GBUILD_PACKAGE_CACHE}
|
||||||
tar xzf ccache.tar.gz
|
tar xf ccache.tar
|
||||||
rm ccache.tar.gz
|
rm ccache.tar
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
# instead of compressing ccache.tar, we let ccache handle it by itself
|
||||||
|
# Otherwise we end up uncompressing/compressing a lot of cache files which we actually never use
|
||||||
|
export CCACHE_COMPRESS=1
|
||||||
else
|
else
|
||||||
CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
|
CONFIGFLAGS="${CONFIGFLAGS} --disable-ccache"
|
||||||
fi
|
fi
|
||||||
@ -200,7 +203,7 @@ script: |
|
|||||||
# Compress ccache (otherwise the assert file will get too huge)
|
# Compress ccache (otherwise the assert file will get too huge)
|
||||||
if [ "$CCACHE_DIR" != "" ]; then
|
if [ "$CCACHE_DIR" != "" ]; then
|
||||||
pushd ${GBUILD_PACKAGE_CACHE}
|
pushd ${GBUILD_PACKAGE_CACHE}
|
||||||
tar czf ccache.tar.gz ccache
|
tar cf ccache.tar ccache
|
||||||
rm -rf ccache
|
rm -rf ccache
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user