RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:57:35 +00:00
Code Issues Activity Actions

Toolchain: Remove cached archive and rebuild if extracting fails

Browse source 
This is currently the case on Travis CI: the file exists but fails to
extract, breaking all the CI builds.
This commit is contained in:
Linus Groh 2020-10-19 19:03:15 +01:00 • committed by Andreas Kling
parent e898c98873
commit 602eb98479
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Toolchain/BuildIt.sh
View file

@ -84,6 +84,7 @@ pushd "$DIR"
CC=${CC},CXX=${CXX},with_gmp=${with_gmp},LDFLAGS=${LDFLAGS}, CC=${CC},CXX=${CXX},with_gmp=${with_gmp},LDFLAGS=${LDFLAGS},
BINUTILS_VERSION=${BINUTILS_VERSION},BINUTILS_MD5SUM=${BINUTILS_MD5SUM}, BINUTILS_VERSION=${BINUTILS_VERSION},BINUTILS_MD5SUM=${BINUTILS_MD5SUM},
GCC_VERSION=${GCC_VERSION},GCC_MD5SUM=${GCC_MD5SUM}" GCC_VERSION=${GCC_VERSION},GCC_MD5SUM=${GCC_MD5SUM}"
CACHED_TOOLCHAIN_ARCHIVE="Cache/ToolchainLocal_${DEPS_HASH}.tar.gz"
if ! DEPS_HASH=$("$DIR/ComputeDependenciesHash.sh" "$MD5SUM" <<<"${DEPS_CONFIG}"); then if ! DEPS_HASH=$("$DIR/ComputeDependenciesHash.sh" "$MD5SUM" <<<"${DEPS_CONFIG}"); then
# Make it stand out more # Make it stand out more
echo echo
@ -99,14 +100,18 @@ pushd "$DIR"
echo echo
# Should be empty anyway, but just to make sure: # Should be empty anyway, but just to make sure:
DEPS_HASH="" DEPS_HASH=""
elif [ -r "Cache/ToolchainLocal_${DEPS_HASH}.tar.gz" ] ; then elif [ -r "${CACHED_TOOLCHAIN_ARCHIVE}" ] ; then
echo "Cache at Cache/ToolchainLocal_${DEPS_HASH}.tar.gz exists!" echo "Cache at ${CACHED_TOOLCHAIN_ARCHIVE} exists!"
echo "Extracting toolchain from cache:" echo "Extracting toolchain from cache:"
tar xzf "Cache/ToolchainLocal_${DEPS_HASH}.tar.gz" if tar xzf "${CACHED_TOOLCHAIN_ARCHIVE}" ; then
echo "Done 'building' the toolchain." echo "Done 'building' the toolchain."
exit 0 exit 0
else else
echo "Cache at Cache/ToolchainLocal_${DEPS_HASH}.tar.gz does not exist." echo "Could not extract cached toolchain archive, removing it and rebuilding from scratch."
rm -f "${CACHED_TOOLCHAIN_ARCHIVE}"
fi
else
echo "Cache at ${CACHED_TOOLCHAIN_ARCHIVE} does not exist."
echo "Will rebuild toolchain from scratch, and save the result." echo "Will rebuild toolchain from scratch, and save the result."
echo "But first, getting rid of old, outdated caches. Current caches:" echo "But first, getting rid of old, outdated caches. Current caches:"
pushd "Cache/" pushd "Cache/"