Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'btc/master' into upstream-merge
- Loading branch information
Showing
921 changed files
with
43,037 additions
and
38,252 deletions.
There are no files selected for viewing
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| version: '{branch}.{build}' | ||
| skip_tags: true | ||
| image: Visual Studio 2017 | ||
| configuration: Release | ||
| platform: x64 | ||
| environment: | ||
| APPVEYOR_SAVE_CACHE_ON_ERROR: true | ||
| CLCACHE_SERVER: 1 | ||
| PACKAGES: boost-filesystem boost-signals2 boost-test libevent openssl zeromq berkeleydb secp256k1 leveldb | ||
| PYTHONIOENCODING: utf-8 | ||
| cache: | ||
| - C:\tools\vcpkg\installed | ||
| - C:\Users\appveyor\clcache | ||
| init: | ||
| - cmd: set PATH=C:\Python36-x64;C:\Python36-x64\Scripts;%PATH% | ||
| install: | ||
| - cmd: pip install git+https://github.com/frerich/clcache.git | ||
| # Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes. | ||
| # - cmd: pip install zmq | ||
| - ps: $packages = $env:PACKAGES -Split ' ' | ||
| - ps: for ($i=0; $i -lt $packages.length; $i++) { | ||
| $env:ALL_PACKAGES += $packages[$i] + ":" + $env:PLATFORM + "-windows-static " | ||
| } | ||
| - cmd: git -C C:\Tools\vcpkg pull # This is a temporary fix, can be removed after appveyor update its image to include Microsoft/vcpkg#4046 | ||
| - cmd: C:\Tools\vcpkg\bootstrap-vcpkg.bat | ||
| - cmd: vcpkg remove --recurse --outdated | ||
| - cmd: vcpkg install %ALL_PACKAGES% | ||
| - cmd: del /s /q C:\Tools\vcpkg\installed\%PLATFORM%-windows-static\debug # Remove unused debug library | ||
| before_build: | ||
| - ps: clcache -M 536870912 | ||
| - cmd: python build_msvc\msvc-autogen.py | ||
| - ps: $files = (Get-ChildItem -Recurse | where {$_.extension -eq ".vcxproj"}).FullName | ||
| - ps: for (${i} = 0; ${i} -lt ${files}.length; ${i}++) { | ||
| ${content} = (Get-Content ${files}[${i}]); | ||
| ${content} = ${content}.Replace("</RuntimeLibrary>", "</RuntimeLibrary><DebugInformationFormat>None</DebugInformationFormat>"); | ||
| ${content} = ${content}.Replace("<WholeProgramOptimization>true", "<WholeProgramOptimization>false"); | ||
| ${content} = ${content}.Replace("NDEBUG;", ""); | ||
| Set-Content ${files}[${i}] ${content}; | ||
| } | ||
| - ps: Start-Process clcache-server | ||
| - ps: fsutil behavior set disablelastaccess 0 # Enable Access time feature on Windows (for clcache) | ||
| build_script: | ||
| - cmd: msbuild /p:TrackFileAccess=false /p:CLToolExe=clcache.exe build_msvc\bitcoin.sln /m /v:q /nowarn:C4244;C4267;C4715 /nologo | ||
| after_build: | ||
| - ps: fsutil behavior set disablelastaccess 0 # Disable Access time feature on Windows (better performance) | ||
| - ps: clcache -z | ||
| before_test: | ||
| - ps: ${conf_ini} = (Get-Content([IO.Path]::Combine(${env:APPVEYOR_BUILD_FOLDER}, "test", "config.ini.in"))) | ||
| - ps: ${conf_ini} = ${conf_ini}.Replace("@abs_top_srcdir@", ${env:APPVEYOR_BUILD_FOLDER}) | ||
| - ps: ${conf_ini} = ${conf_ini}.Replace("@abs_top_builddir@", ${env:APPVEYOR_BUILD_FOLDER}) | ||
| - ps: ${conf_ini} = ${conf_ini}.Replace("@EXEEXT@", ".exe") | ||
| - ps: ${conf_ini} = ${conf_ini}.Replace("@ENABLE_WALLET_TRUE@", "") | ||
| - ps: ${conf_ini} = ${conf_ini}.Replace("@BUILD_BITCOIN_CLI_TRUE@", "") | ||
| - ps: ${conf_ini} = ${conf_ini}.Replace("@BUILD_BITCOIND_TRUE@", "") | ||
| - ps: ${conf_ini} = ${conf_ini}.Replace("@ENABLE_ZMQ_TRUE@", "") | ||
| - ps: ${utf8} = New-Object System.Text.UTF8Encoding ${false} | ||
| - ps: '[IO.File]::WriteAllLines([IO.Path]::Combine(${env:APPVEYOR_BUILD_FOLDER}, "test", "config.ini"), ${conf_ini}, ${utf8})' | ||
| - ps: move "build_msvc\${env:PLATFORM}\${env:CONFIGURATION}\*.exe" src | ||
| test_script: | ||
| - cmd: src\test_bitcoin.exe | ||
| - ps: src\bench_bitcoin.exe -evals=1 -scaling=0 | ||
| - ps: python test\util\bitcoin-util-test.py | ||
| - cmd: python test\util\rpcauth-test.py | ||
| - cmd: python test\functional\test_runner.py --force --quiet --combinedlogslen=4000 --exclude wallet_multiwallet | ||
| deploy: off |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| Pull requests without a rationale and clear improvement may be closed | ||
| immediately. | ||
|
|
||
| Please provide clear motivation for your patch and explain how it improves | ||
| Bitcoin Core user experience or Bitcoin Core developer experience | ||
| significantly. | ||
|
|
||
| * Any test improvements or new tests that improve coverage are always welcome. | ||
| * All other changes should have accompanying unit tests (see `src/test/`) or | ||
| functional tests (see `test/`). Contributors should note which tests cover | ||
| modified code. If no tests exist for a region of modified code, new tests | ||
| should accompany the change. | ||
| * Bug fixes are most welcome when they come with steps to reproduce or an | ||
| explanation of the potential issue as well as reasoning for the way the bug | ||
| was fixed. | ||
| * Features are welcome, but might be rejected due to design or scope issues. | ||
| If a feature is based on a lot of dependencies, contributors should first | ||
| consider building the system outside of Bitcoin Core, if possible. | ||
| * Refactoring changes are only accepted if they are required for a feature or | ||
| bug fix or otherwise improve developer experience significantly. For example, | ||
| most "code style" refactoring changes require a thorough explanation why they | ||
| are useful, what downsides they have and why they *significantly* improve | ||
| developer experience or avoid serious programming bugs. Note that code style | ||
| is often a subjective matter. Unless they are explicitly mentioned to be | ||
| preferred in the [developer notes](/doc/developer-notes.md), stylistic code | ||
| changes are usually rejected. | ||
|
|
||
| Bitcoin Core has a thorough review process and even the most trivial change | ||
| needs to pass a lot of eyes and requires non-zero or even substantial time | ||
| effort to review. There is a huge lack of active reviewers on the project, so | ||
| patches often sit for a long time. |
This file contains 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 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 |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| ## travis build scripts | ||
|
|
||
| The `.travis` directory contains scripts for each build step in each build stage. | ||
| Currently the travis build defines two stages `lint` and `test`. Each stage has | ||
| it's own [lifecycle](https://docs.travis-ci.com/user/customizing-the-build/#the-build-lifecycle). | ||
| Every script in here is named and numbered according to which stage and lifecycle | ||
| step it belongs to. | ||
|
|
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C | ||
|
|
||
| travis_retry pip install codespell==1.13.0 | ||
| travis_retry pip install flake8 |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C | ||
|
|
||
| git fetch --unshallow |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C | ||
|
|
||
| if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then | ||
| test/lint/commit-script-check.sh $TRAVIS_COMMIT_RANGE | ||
| fi | ||
|
|
||
| test/lint/git-subtree-check.sh src/crypto/ctaes | ||
| test/lint/git-subtree-check.sh src/secp256k1 | ||
| test/lint/git-subtree-check.sh src/univalue | ||
| test/lint/git-subtree-check.sh src/leveldb | ||
| test/lint/check-doc.py | ||
| test/lint/check-rpc-mappings.py . | ||
| test/lint/lint-all.sh | ||
|
|
||
| if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then | ||
| while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys && | ||
| travis_wait 50 contrib/verify-commits/verify-commits.py; | ||
| fi |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C.UTF-8 | ||
|
|
||
| PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g") | ||
| export PATH | ||
|
|
||
| BEGIN_FOLD () { | ||
| echo "" | ||
| CURRENT_FOLD_NAME=$1 | ||
| echo "travis_fold:start:${CURRENT_FOLD_NAME}" | ||
| } | ||
|
|
||
| END_FOLD () { | ||
| RET=$? | ||
| echo "travis_fold:end:${CURRENT_FOLD_NAME}" | ||
| if [ $RET != 0 ]; then | ||
| echo "${CURRENT_FOLD_NAME} failed with status code ${RET}" | ||
| fi | ||
| } | ||
|
|
Oops, something went wrong.