Speed up CI builds with ccache (seeded from develop) #16385
+183
−25
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| #!/usr/bin/env bash | ||
| set -ex | ||
|
|
||
| ROOTDIR="$(realpath "$(dirname "$0")/../..")" | ||
r0qs marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| # shellcheck source=scripts/common.sh | ||
| source "${ROOTDIR}/scripts/common.sh" | ||
|
|
||
|
|
@@ -16,7 +16,17 @@ cd build | |
|
|
||
| [[ -n $COVERAGE && -z $CIRCLE_TAG ]] && CMAKE_OPTIONS="$CMAKE_OPTIONS -DCOVERAGE=ON" | ||
|
|
||
| export CCACHE_DIR="$HOME/.ccache" | ||
| export CCACHE_BASEDIR="$ROOTDIR" | ||
| export CCACHE_NOHASHDIR=1 | ||
| CMAKE_OPTIONS="${CMAKE_OPTIONS:-} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache" | ||
|
Member
There was a problem hiding this comment. We already have ccache detection in place, I’m wondering whether it would be better to let CMake handle this automatically and remove
Member
There was a problem hiding this comment. We would probably need to add
Member
There was a problem hiding this comment. I kinda like that it's explicit. Never understood why we need this
Member
There was a problem hiding this comment. Haha sure. We can keep it as it is then, and don't change the |
||
| mkdir -p "$CCACHE_DIR" | ||
|
|
||
| # shellcheck disable=SC2086 | ||
| cmake .. -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" $CMAKE_OPTIONS | ||
|
|
||
| ccache -z | ||
|
|
||
| cmake --build . | ||
|
|
||
| ccache -s | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,22 +6,49 @@ prerelease_source="${1:-ci}" | |
| ROOTDIR="$(realpath "$(dirname "$0")/../../")" | ||
| FORCE_RELEASE="${FORCE_RELEASE:-}" | ||
| CIRCLE_TAG="${CIRCLE_TAG:-}" | ||
| CMAKE_VS_GLOBALS_ARG=() | ||
|
|
||
| cd "$ROOTDIR" | ||
| "${ROOTDIR}/scripts/prerelease_suffix.sh" "$prerelease_source" "$CIRCLE_TAG" > prerelease.txt | ||
|
|
||
| export CCACHE_DIR="$HOME/.ccache" | ||
| export CCACHE_BASEDIR="$ROOTDIR" | ||
| export CCACHE_NOHASHDIR=1 | ||
| export CCACHE_COMPILERTYPE=msvc | ||
| VSWHERE="${VSWHERE:-C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe}" | ||
| VS_INSTALL="$("$VSWHERE" -latest -products "*" \ | ||
| -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \ | ||
| -property installationPath | tr -d '\r')" | ||
| VCTOOLS_VERSION="$(tr -d '\r' < "$VS_INSTALL/VC/Auxiliary/Build/Microsoft.VCToolsVersion.default.txt")" | ||
| CCACHE_COMPILER="$VS_INSTALL/VC/Tools/MSVC/$VCTOOLS_VERSION/bin/Hostx64/x64/cl.exe" | ||
| CCACHE_COMPILER="${CCACHE_COMPILER//\\//}" | ||
| export CCACHE_COMPILER | ||
| PATH="$ROOTDIR/deps/ccache:$(dirname "$CCACHE_COMPILER"):$PATH" | ||
| export PATH | ||
| # Use a Windows-style path for Visual Studio globals. | ||
| WIN_PWD="$(pwd -W)" | ||
| # Visual Studio generator doesn't use compiler launchers; use ccache masquerade. | ||
| # See https://github.com/ccache/ccache/wiki/MS-Visual-Studio | ||
| CMAKE_VS_GLOBALS="CLToolPath=${WIN_PWD}/deps/ccache;UseMultiToolTask=true" | ||
| CMAKE_VS_GLOBALS_ARG=(-DCMAKE_VS_GLOBALS="$CMAKE_VS_GLOBALS") | ||
|
Comment on lines
+32
to
+33
Member
There was a problem hiding this comment. Can this be done by cmake? See: https://github.com/ccache/ccache/wiki/MS-Visual-Studio#usage-with-cmake Maybe we can add that you our cmake ccache config. |
||
| mkdir -p "$CCACHE_DIR" | ||
|
|
||
| mkdir -p build/ | ||
| cd build/ | ||
|
|
||
| # NOTE: Using an array to force Bash to do wildcard expansion | ||
| boost_dir=("${ROOTDIR}/deps/boost/lib/cmake/Boost-"*) | ||
|
|
||
| # shellcheck disable=SC2086 | ||
| "${ROOTDIR}/deps/cmake/bin/cmake" \ | ||
| -G "Visual Studio 16 2019" \ | ||
| -DBoost_DIR="${boost_dir[*]}" \ | ||
| -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded \ | ||
| -DCMAKE_INSTALL_PREFIX="${ROOTDIR}/uploads/" \ | ||
| "${CMAKE_VS_GLOBALS_ARG[@]}" \ | ||
| ${CMAKE_OPTIONS:-} \ | ||
| .. | ||
| ccache -z | ||
| MSBuild.exe solidity.sln \ | ||
| -property:Configuration=Release \ | ||
| -maxCpuCount:10 \ | ||
|
|
@@ -31,3 +58,4 @@ MSBuild.exe solidity.sln \ | |
| -j 10 \ | ||
| --target install \ | ||
| --config Release | ||
| ccache -s | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.