Merge pull request ethereum#12376 from ethereum/develop

Merge `develop` into `breaking`
mejsiej · Dec 13, 2021 · 0bbf58e · 0bbf58e
2 parents 88cc422 + 2f90f2e
commit 0bbf58e
Show file tree

Hide file tree

Showing 406 changed files with 2,946 additions and 1,983 deletions.
diff --git a/.circleci/build_win.ps1 b/.circleci/build_win.ps1
@@ -20,7 +20,7 @@ cd build
 $boost_dir=(Resolve-Path $PSScriptRoot\..\deps\boost\lib\cmake\Boost-*)
 ..\deps\cmake\bin\cmake -G "Visual Studio 16 2019" -DBoost_DIR="$boost_dir\" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_INSTALL_PREFIX="$PSScriptRoot\..\upload" -DUSE_Z3=OFF ..
 if ( -not $? ) { throw "CMake configure failed." }
-msbuild solidity.sln /p:Configuration=Release /m:5 /v:minimal
+msbuild solidity.sln /p:Configuration=Release /m:10 /v:minimal
 if ( -not $? ) { throw "Build failed." }
-..\deps\cmake\bin\cmake --build . -j 5 --target install --config Release
+..\deps\cmake\bin\cmake --build . -j 10 --target install --config Release
 if ( -not $? ) { throw "Install target failed." }