Skip to content

Commit 3311e33

Browse files
author
MIPPL
committed
Merge commit '351fbf65efc9459cb69a3c843cc205a8b94c95b3' into develop
* commit '351fbf65efc9459cb69a3c843cc205a8b94c95b3': (987 commits) Update release-notes Bump nMinimumChainWork and defaultAssumeValid (dashpay#3336) Update release notes Try to actually accept newly created dstx-es into masternode's mempool (dashpay#3332) Switch CLIENT_VERSION_IS_RELEASE to `true` for v0.15 (dashpay#3306) Update release notes Bring back "about" menu icon (dashpay#3329) Add pubKeyOperator to `quorum info` rpc response (dashpay#3327) Update release-notes.md Update translations 2020-02-03 (dashpay#3322) Only sync mempool from v0.15+ (proto 70216+) nodes (dashpay#3321) Fix dark text on dark background in combobox dropdowns on windows (dashpay#3315) Fix node protection logic false positives (dashpay#3314) Merge bitcoin#13162: [net] Don't incorrectly log that REJECT messages are unknown. More of 13946 Merge bitcoin#13946: p2p: Clarify control flow in ProcessMessage Add `automake` package to dash-win-signer's packages list (dashpay#3307) [Trivial] Release note update (dashpay#3308) Update release-notes.md Fix CActiveMasternodeManager::GetLocalAddress to prefer IPv4 if multiple local addresses are known (dashpay#3304) ... # Conflicts: # .gitignore # .travis.yml # COPYING # Makefile.am # README.md # ci/test_unittests.sh # configure.ac # contrib/README.md # contrib/debian/control # contrib/devtools/optimize-pngs.py # contrib/gitian-build.py # contrib/gitian-descriptors/gitian-linux.yml # contrib/gitian-descriptors/gitian-osx.yml # contrib/gitian-descriptors/gitian-win-signer.yml # contrib/gitian-descriptors/gitian-win.yml # contrib/init/README.md # contrib/seeds/README.md # contrib/verifybinaries/verify.sh # doc/README.md # doc/README_windows.txt # doc/build-generic.md # doc/build-unix.md # doc/files.md # doc/man/biblepay-cli.1 # doc/man/biblepay-qt.1 # doc/man/biblepay-tx.1 # doc/man/biblepayd.1 # doc/release-notes.md # doc/release-process.md # qa/README.md # qa/rpc-tests/autois-mempool.py # qa/rpc-tests/maxblocksinflight.py # qa/rpc-tests/multikeysporks.py # qa/rpc-tests/p2p-acceptblock.py # qa/rpc-tests/p2p-autoinstantsend.py # share/pixmaps/dash128.png # share/pixmaps/dash16.png # share/pixmaps/dash32.png # share/pixmaps/dash64.png # src/Makefile.am # src/Makefile.qt.include # src/Makefile.qttest.include # src/Makefile.test.include # src/addrman.h # src/alert.cpp # src/alert.h # src/bench/bls.cpp # src/bench/crypto_hash.cpp # src/biblepay-cli.cpp # src/biblepayd.cpp # src/blockencodings.cpp # src/bls/bls.cpp # src/bls/bls.h # src/bls/bls_worker.cpp # src/bls/bls_worker.h # src/cachemap.h # src/cachemultimap.h # src/chain.h # src/chainparams.cpp # src/checkpoints.cpp # src/clientversion.h # src/evo/cbtx.cpp # src/evo/cbtx.h # src/evo/deterministicmns.h # src/evo/evodb.cpp # src/evo/evodb.h # src/evo/providertx.cpp # src/evo/providertx.h # src/evo/simplifiedmns.h # src/evo/specialtx.cpp # src/evo/specialtx.h # src/flat-database.h # src/governance/governance-classes.cpp # src/governance/governance-exceptions.h # src/governance/governance-object.cpp # src/governance/governance-object.h # src/governance/governance-validators.cpp # src/governance/governance-validators.h # src/governance/governance-vote.h # src/governance/governance-votedb.cpp # src/governance/governance-votedb.h # src/governance/governance.cpp # src/hash.h # src/hdchain.cpp # src/hdchain.h # src/httpserver.cpp # src/init.cpp # src/instantx.cpp # src/instantx.h # src/keepass.cpp # src/keepass.h # src/llmq/quorums_blockprocessor.h # src/llmq/quorums_commitment.h # src/masternode/activemasternode.cpp # src/masternode/masternode-payments.cpp # src/masternode/masternode-sync.cpp # src/messagesigner.cpp # src/messagesigner.h # src/miner.cpp # src/net.cpp # src/net.h # src/net_processing.cpp # src/netbase.cpp # src/netfulfilledman.cpp # src/netfulfilledman.h # src/policy/feerate.cpp # src/policy/fees.cpp # src/pow.cpp # src/primitives/transaction.h # src/privatesend/privatesend-client.cpp # src/privatesend/privatesend-client.h # src/privatesend/privatesend-server.cpp # src/privatesend/privatesend-server.h # src/privatesend/privatesend-util.cpp # src/privatesend/privatesend-util.h # src/privatesend/privatesend.cpp # src/privatesend/privatesend.h # src/protocol.cpp # src/qt/addressbookpage.cpp # src/qt/addresstablemodel.cpp # src/qt/askpassphrasedialog.cpp # src/qt/biblepay.cpp # src/qt/biblepay.qrc # src/qt/bitcoingui.cpp # src/qt/clientmodel.h # src/qt/dash_locale.qrc # src/qt/dashstrings.cpp # src/qt/forms/helpmessagedialog.ui # src/qt/forms/masternodelist.ui # src/qt/forms/optionsdialog.ui # src/qt/guiconstants.h # src/qt/guiutil.cpp # src/qt/guiutil.h # src/qt/locale/biblepay_ar.ts # src/qt/locale/biblepay_bg.ts # src/qt/locale/biblepay_de.ts # src/qt/locale/biblepay_en.ts # src/qt/locale/biblepay_es.ts # src/qt/locale/biblepay_fi.ts # src/qt/locale/biblepay_fr.ts # src/qt/locale/biblepay_it.ts # src/qt/locale/biblepay_ja.ts # src/qt/locale/biblepay_ko.ts # src/qt/locale/biblepay_nl.ts # src/qt/locale/biblepay_pl.ts # src/qt/locale/biblepay_pt.ts # src/qt/locale/biblepay_ru.ts # src/qt/locale/biblepay_sk.ts # src/qt/locale/biblepay_sv.ts # src/qt/locale/biblepay_th.ts # src/qt/locale/biblepay_tr.ts # src/qt/locale/biblepay_vi.ts # src/qt/locale/biblepay_zh_CN.ts # src/qt/locale/biblepay_zh_TW.ts # src/qt/networkstyle.cpp # src/qt/optionsdialog.cpp # src/qt/overviewpage.cpp # src/qt/paymentserver.cpp # src/qt/res/css/bezaleel.css # src/qt/res/css/dark.css # src/qt/res/css/drkblue.css # src/qt/res/css/light-hires-retro.css # src/qt/res/css/light-hires.css # src/qt/res/css/light.css # src/qt/res/icons/about.png # src/qt/res/icons/about_qt.png # src/qt/res/icons/bezaleel/drkblue_address-book.png # src/qt/res/icons/bezaleel/drkblue_editcopy.png # src/qt/res/icons/bezaleel/drkblue_editpaste.png # src/qt/res/icons/bezaleel/drkblue_remove.png # src/qt/res/icons/bezaleel/fontbigger.png # src/qt/res/icons/bezaleel/fontsmaller.png # src/qt/res/icons/bezaleel/hd_disabled.png # src/qt/res/icons/bezaleel/hd_enabled.png # src/qt/res/icons/bezaleel/network_disabled.png # src/qt/res/icons/bezaleel/transaction_abandoned.png # src/qt/res/icons/bitcoin_testnet.png # src/qt/res/icons/browse.png # src/qt/res/icons/configure.png # src/qt/res/icons/crownium/fontbigger.png # src/qt/res/icons/crownium/fontsmaller.png # src/qt/res/icons/crownium/hd_disabled.png # src/qt/res/icons/crownium/hd_enabled.png # src/qt/res/icons/crownium/network_disabled.png # src/qt/res/icons/crownium/transaction_abandoned.png # src/qt/res/icons/dacicons/drkblue_editcopy.png # src/qt/res/icons/dacicons/drkblue_remove.png # src/qt/res/icons/debugwindow.png # src/qt/res/icons/drkblue/about.png # src/qt/res/icons/drkblue/masternodes.png # src/qt/res/icons/drkblue/overview.png # src/qt/res/icons/drkblue/tx_mined.png # src/qt/res/icons/drkblue/tx_output.png # src/qt/res/icons/filesave.png # src/qt/res/icons/fontbigger.png # src/qt/res/icons/fontsmaller.png # src/qt/res/icons/hd_disabled.png # src/qt/res/icons/hd_enabled.png # src/qt/res/icons/key.png # src/qt/res/icons/light-retro/about.png # src/qt/res/icons/light-retro/masternodes.png # src/qt/res/icons/light-retro/overview.png # src/qt/res/icons/light-retro/tx_mined.png # src/qt/res/icons/light/about.png # src/qt/res/icons/light/masternodes.png # src/qt/res/icons/light/overview.png # src/qt/res/icons/light/tx_mined.png # src/qt/res/icons/network_disabled.png # src/qt/res/icons/notsynced.png # src/qt/res/icons/quit.png # src/qt/res/icons/trad/about.png # src/qt/res/icons/trad/masternodes.png # src/qt/res/icons/trad/overview.png # src/qt/res/icons/trad/receive.png # src/qt/res/icons/trad/send.png # src/qt/res/icons/trad/tx_inout.png # src/qt/res/icons/trad/tx_input.png # src/qt/res/icons/trad/tx_mined.png # src/qt/res/icons/trad/tx_output.png # src/qt/res/icons/transaction_abandoned.png # src/qt/res/images/drkblue/about.png # src/qt/res/images/drkblue/checked.png # src/qt/res/images/drkblue/drkblue_walletFrame_bg.png # src/qt/res/images/drkblue/splash.png # src/qt/res/images/drkblue/splash_testnet.png # src/qt/res/images/drkblue/unchecked.png # src/qt/res/images/light-retro/about.png # src/qt/res/images/light-retro/checked.png # src/qt/res/images/light-retro/drkblue_downArrow.png # src/qt/res/images/light-retro/drkblue_downArrow_small.png # src/qt/res/images/light-retro/drkblue_leftArrow_small.png # src/qt/res/images/light-retro/drkblue_qtreeview_selected.png # src/qt/res/images/light-retro/drkblue_rightArrow_small.png # src/qt/res/images/light-retro/drkblue_upArrow_small.png # src/qt/res/images/light-retro/drkblue_walletFrame_bg.png # src/qt/res/images/light-retro/splash.png # src/qt/res/images/light-retro/splash_testnet.png # src/qt/res/images/light-retro/unchecked.png # src/qt/res/images/light/about.png # src/qt/res/images/light/checked.png # src/qt/res/images/light/drkblue_downArrow.png # src/qt/res/images/light/drkblue_downArrow_small.png # src/qt/res/images/light/drkblue_leftArrow_small.png # src/qt/res/images/light/drkblue_qtreeview_selected.png # src/qt/res/images/light/drkblue_rightArrow_small.png # src/qt/res/images/light/drkblue_upArrow_small.png # src/qt/res/images/light/drkblue_walletFrame_bg.png # src/qt/res/images/light/splash_testnet.png # src/qt/res/images/light/unchecked.png # src/qt/res/images/trad/about.png # src/qt/res/images/trad/drkblue_downArrow.png # src/qt/res/images/trad/drkblue_downArrow_small.png # src/qt/res/images/trad/drkblue_leftArrow_small.png # src/qt/res/images/trad/drkblue_qtreeview_selected.png # src/qt/res/images/trad/drkblue_rightArrow_small.png # src/qt/res/images/trad/drkblue_upArrow_small.png # src/qt/res/images/trad/drkblue_walletFrame_bg.png # src/qt/res/images/trad/splash.png # src/qt/res/images/trad/splash_testnet.png # src/qt/res/src/spinner.png # src/qt/rpcconsole.cpp # src/qt/sendcoinsdialog.cpp # src/qt/signverifymessagedialog.cpp # src/qt/splashscreen.cpp # src/qt/test/rpcnestedtests.cpp # src/qt/test/test_main.cpp # src/qt/test/uritests.cpp # src/qt/transactiondesc.cpp # src/qt/transactionrecord.cpp # src/qt/transactiontablemodel.cpp # src/qt/walletmodel.cpp # src/rpc/blockchain.cpp # src/rpc/governance.cpp # src/rpc/masternode.cpp # src/rpc/mining.cpp # src/rpc/misc.cpp # src/rpc/net.cpp # src/rpc/protocol.cpp # src/rpc/rawtransaction.cpp # src/rpc/rpcevo.cpp # src/rpc/server.cpp # src/script/biblepayconsensus.cpp # src/script/dashconsensus.h # src/sendalert.cpp # src/spork.cpp # src/spork.h # src/test/README.md # src/test/addrman_tests.cpp # src/test/alert_tests.cpp # src/test/amount_tests.cpp # src/test/blockencodings_tests.cpp # src/test/coins_tests.cpp # src/test/crypto_tests.cpp # src/test/cuckoocache_tests.cpp # src/test/data/alertTests.raw # src/test/merkle_tests.cpp # src/test/miner_tests.cpp # src/test/netbase_tests.cpp # src/test/pmt_tests.cpp # src/test/prevector_tests.cpp # src/test/ratecheck_tests.cpp # src/test/script_tests.cpp # src/test/sighash_tests.cpp # src/test/skiplist_tests.cpp # src/test/test_coin.cpp # src/test/test_coin.h # src/test/txvalidationcache_tests.cpp # src/test/util_tests.cpp # src/test/versionbits_tests.cpp # src/torcontrol.cpp # src/txdb.cpp # src/uint256.h # src/util.cpp # src/util.h # src/validation.cpp # src/validation.h # src/version.h # src/wallet/crypter.cpp # src/wallet/db.cpp # src/wallet/rpcdump.cpp # src/wallet/rpcwallet.cpp # src/wallet/test/crypto_tests.cpp # src/wallet/wallet.cpp # src/wallet/wallet.h # src/wallet/walletdb.cpp # test/functional/fundrawtransaction.py # test/functional/import-rescan.py # test/functional/merkle_blocks.py # test/functional/multi_rpc.py # test/functional/p2p-instantsend.py # test/functional/sporks.py # test/functional/test_framework/comptool.py # test/functional/test_framework/mininode.py # test/functional/test_framework/util.py # test/functional/wallet-hd.py # test/functional/wallet.py
2 parents 6d68ca8 + 351fbf6 commit 3311e33

File tree

1,014 files changed

+43318
-20646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,014 files changed

+43318
-20646
lines changed

.gitignore

+2-3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,8 @@ coverage_percent.txt
111111
linux-coverage-build
112112
linux-build
113113
win32-build
114-
qa/pull-tester/tests_config.py
115-
qa/pull-tester/tests_config.ini
116-
qa/cache/*
114+
test/config.ini
115+
test/cache/*
117116

118117
!src/leveldb*/Makefile
119118

.gitlab-ci.yml

+159
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
image: "ubuntu:bionic"
2+
3+
variables:
4+
DOCKER_DRIVER: overlay2
5+
6+
cache:
7+
# Cache by branch/tag and job name
8+
# Gitlab can't use caches from parent pipelines when doing the first build in a PR, so we use artifacts to copy
9+
# caches into PRs
10+
key: ${CI_COMMIT_REF_SLUG}-${CI_JOB_NAME}${CI_EXTERNAL_PULL_REQUEST_IID}
11+
paths:
12+
- $CI_PROJECT_DIR/cache
13+
14+
stages:
15+
- build
16+
17+
.build_template: &build_template
18+
stage: build
19+
before_script:
20+
- export BUILD_TARGET="$CI_JOB_NAME"
21+
- echo BUILD_TARGET=$BUILD_TARGET
22+
- source ./ci/matrix.sh
23+
24+
# The ubuntu base image has apt configured to delete caches after each invocation, which is something that is not desirable for us
25+
- rm /etc/apt/apt.conf.d/docker-clean
26+
- apt-get update
27+
- apt-get install -y wget unzip
28+
29+
# Init cache
30+
- export CACHE_DIR=$CI_PROJECT_DIR/cache
31+
- mkdir -p $CACHE_DIR
32+
- |
33+
if [ "$CI_COMMIT_REF_SLUG" != "develop" -a "$CI_COMMIT_TAG" == "" ]; then
34+
if [ ! -d $CACHE_DIR/ccache ]; then
35+
echo "Downloading cache from develop branch"
36+
mkdir cache-artifact
37+
cd cache-artifact
38+
if wget --quiet -O cache-artifact.zip https://gitlab.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/-/jobs/artifacts/develop/download?job=$CI_JOB_NAME; then
39+
unzip -q cache-artifact.zip
40+
rm cache-artifact.zip
41+
mv cache-artifact/* $CACHE_DIR/ || true
42+
else
43+
echo "Failed to download cache"
44+
fi
45+
cd ..
46+
rm -rf cache-artifact
47+
else
48+
echo "Not touching cache (was initialized from previous build)"
49+
fi
50+
else
51+
echo "Not touching cache (building develop branch or tag)"
52+
fi
53+
# Create missing cache dirs
54+
- mkdir -p $CACHE_DIR/ccache && mkdir -p $CACHE_DIR/depends && mkdir -p $CACHE_DIR/sdk-sources && mkdir -p $CACHE_DIR/apt
55+
# Keep this as it makes caching related debugging easier
56+
- ls -lah $CACHE_DIR && ls -lah $CACHE_DIR/depends && ls -lah $CACHE_DIR/ccache && ls -lah $CACHE_DIR/apt
57+
- mv $CACHE_DIR/apt/* /var/cache/apt/archives/ || true
58+
59+
# Install base packages
60+
- apt-get dist-upgrade -y
61+
- apt-get install -y git g++ autotools-dev libtool m4 automake autoconf pkg-config zlib1g-dev libssl1.0-dev curl ccache bsdmainutils cmake
62+
- apt-get install -y python3 python3-dev python3-pip
63+
64+
# jinja2 is needed for combine_logs.py
65+
- pip3 install jinja2
66+
67+
# Setup some environment variables
68+
- |
69+
if [ "$CI_EXTERNAL_PULL_REQUEST_IID" != "" ]; then
70+
export PULL_REQUEST="true"
71+
else
72+
# CI_EXTERNAL_PULL_REQUEST_IID is false every time until https://gitlab.com/gitlab-org/gitlab/issues/5667 is done
73+
# Until then, we're using https://github.com/brndnmtthws/labhub atm to mirror Github pull requests as branches into Gitlab,
74+
# which allows us to use Gitlab CI for Github. The following check detects such mirrored branches.
75+
if [[ $CI_COMMIT_REF_NAME =~ ^pr-[^/]*/[^/]*/[^/]*/[^/]*$ ]]; then
76+
export PULL_REQUEST="true"
77+
# CI_COMMIT_BEFORE_SHA is also invalid until #5667 is implemented, so we need to figure it out by ourself
78+
git fetch origin develop
79+
export CI_COMMIT_BEFORE_SHA="$(git merge-base origin/develop HEAD)"
80+
else
81+
export PULL_REQUEST="false"
82+
fi
83+
fi
84+
- export COMMIT_RANGE="$CI_COMMIT_BEFORE_SHA..$CI_COMMIT_SHA"
85+
- export JOB_NUMBER="$CI_JOB_ID"
86+
- export HOST_SRC_DIR=$CI_PROJECT_DIR
87+
- echo PULL_REQUEST=$PULL_REQUEST COMMIT_RANGE=$COMMIT_RANGE HOST_SRC_DIR=$HOST_SRC_DIR CACHE_DIR=$CACHE_DIR
88+
- echo "Commit log:" && git log --format=fuller -1
89+
90+
# Build dash_hash
91+
- git clone https://github.com/dashpay/dash_hash
92+
- cd dash_hash && python3 setup.py install
93+
94+
# Install build target specific packages
95+
- echo PACKAGES=$PACKAGES
96+
- if [ -n "$DPKG_ADD_ARCH" ]; then dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi
97+
- if [ -n "$PACKAGES" ]; then apt-get update && apt-get install -y --no-install-recommends --no-upgrade $PACKAGES; fi
98+
99+
# Move apt packages into cache
100+
- mv /var/cache/apt/archives/* $CACHE_DIR/apt/ || true
101+
102+
# Make mingw use correct threading libraries
103+
- update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix || true
104+
- update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix || true
105+
- update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix || true
106+
- update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix || true
107+
108+
script:
109+
- export BUILD_TARGET="$CI_JOB_NAME"
110+
- cd $CI_PROJECT_DIR
111+
- ./ci/build_depends.sh
112+
- ./ci/build_src.sh
113+
- ./ci/test_unittests.sh
114+
- ./ci/test_integrationtests.sh --extended --exclude pruning,dbcrash
115+
116+
after_script:
117+
# Copy all cache files into cache-artifact so that they get uploaded. We only do this for develop so that artifacts
118+
# stay minimal for PRs and branches (we never need them)
119+
- mkdir -p $CI_PROJECT_DIR/cache-artifact
120+
- mkdir -p $CI_PROJECT_DIR/testlogs
121+
- |
122+
if [ "$CI_COMMIT_REF_SLUG" = "develop" ]; then
123+
cp -ra $CI_PROJECT_DIR/cache/* $CI_PROJECT_DIR/cache-artifact/
124+
fi
125+
126+
# We're actually only interested in the develop branch creating the cache artifact, but there is no way to control this
127+
# until https://gitlab.com/gitlab-org/gitlab-foss/issues/25478 gets implemented. Until then, we use an expiration time of
128+
# 3 days and rely on daily builds to refresh the cache artifacts. We also keep non-develop artifacts at minimum size
129+
artifacts:
130+
name: cache-artifact
131+
when: always
132+
paths:
133+
- $CI_PROJECT_DIR/cache-artifact
134+
- $CI_PROJECT_DIR/testlogs
135+
expire_in: 3 days
136+
137+
arm-linux:
138+
<<: *build_template
139+
140+
win32:
141+
<<: *build_template
142+
143+
win64:
144+
<<: *build_template
145+
146+
linux32:
147+
<<: *build_template
148+
149+
linux64:
150+
<<: *build_template
151+
152+
linux64_nowallet:
153+
<<: *build_template
154+
155+
linux64_release:
156+
<<: *build_template
157+
158+
mac:
159+
<<: *build_template

.travis.yml

+88-10
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ sudo: required
66
dist: trusty
77

88
os: linux
9-
language: generic
9+
language: minimal
1010

1111
addons:
1212
apt:
@@ -33,15 +33,90 @@ env:
3333
- secure: "RLzlMhfLqwSBrZqJOVOd61suXBn+HtUR3vOZfuFYF/Qmjjj5TE41+rObZmzc54hP/ZL+OH6blnibpvfDXlX+eN38ivFQfuxkJIGL68SJsEwNBRwW39Yw6Hl5RdI41MLCH7ByN15wifLp1JKBilHJ7XGMOUjI7P0yl7JjX8GBXUCtJbVLRugo80/yn+XQ1NdnlpbpYHNjMEQFWSODPa3pSK5McWvyQjDZDgS+IkdrZmIYJPMa7bmKH5I/edUPSmXQT905FgEwq9u8XR0SyBopli21EK9l6GkXIIvmDTYz5vT26Apvi2B4Aoazlklg+KNRUJuLGerpt6kbnU0gMSUChVkFfFhOk6GRSN3a/AUfD2FOudvMhet2QvlPHx+GYdEUr5XVo5HW42pHsqfD6eDtHd8VLTsHP0q4C8V85fNMv21lkkehy2ry8fx/RRy6x4O2wg2mua+79UkGKXp75gMKzWEcth34PCFCOu37l2F8R/ANnrQ52K/8vIQ88TtU2OpYX89fHjLojBxu+WKEBGZH2LRPsZBOUHeeO5C/xKDrhZU24ORnMW8wg66Qg5GIX1KI4a8yp73Mpues5hzpJ6wkMuRrQt40ymKndLCjv8KSd+5BfP6Or/KIrzDNYdZaasjk7JNi6rcZmm9d3fTAo+Ja/mjpUCIOo3SX14luzVCJIig="
3434
- DOCKER_BUILD=false
3535

36-
matrix:
37-
- BUILD_TARGET=arm-linux
38-
- BUILD_TARGET=win32
39-
- BUILD_TARGET=win64
40-
- BUILD_TARGET=linux32
41-
- BUILD_TARGET=linux64
42-
- BUILD_TARGET=linux64_nowallet
43-
- BUILD_TARGET=linux64_release DOCKER_BUILD=true
44-
- BUILD_TARGET=mac
36+
stages:
37+
- build depends
38+
- build src
39+
- run tests
40+
- build docker
41+
42+
builddepends: &builddepends
43+
stage: build depends
44+
script:
45+
- $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh
46+
47+
buildsrc: &buildsrc
48+
stage: build src
49+
script:
50+
- $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh
51+
- $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh
52+
53+
runtests: &runtests
54+
stage: run tests
55+
script:
56+
- $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh
57+
- $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh
58+
- $DOCKER_RUN_IN_BUILDER ./ci/test_unittests.sh
59+
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude pruning,dbcrash"; fi
60+
- $DOCKER_RUN_IN_BUILDER ./ci/test_integrationtests.sh --jobs=3 ${extended}
61+
62+
builddocker: &builddocker
63+
stage: build docker
64+
script:
65+
# no need to run tests again here
66+
- if [ "$DOCKER_BUILD" = "true" ]; then $DOCKER_RUN_IN_BUILDER ./ci/build_depends.sh && $DOCKER_RUN_IN_BUILDER ./ci/build_src.sh && BUILD_DIR=build-ci/dashcore-$BUILD_TARGET ./docker/build-docker.sh; fi
67+
68+
jobs:
69+
include:
70+
# build depends
71+
- <<: *builddepends
72+
env: BUILD_TARGET=arm-linux
73+
- <<: *builddepends
74+
env: BUILD_TARGET=win32
75+
- <<: *builddepends
76+
env: BUILD_TARGET=win64
77+
- <<: *builddepends
78+
env: BUILD_TARGET=linux32
79+
- <<: *builddepends
80+
env: BUILD_TARGET=linux64
81+
- <<: *builddepends
82+
env: BUILD_TARGET=linux64_nowallet
83+
- <<: *builddepends
84+
env: BUILD_TARGET=linux64_release DOCKER_BUILD=true
85+
- <<: *builddepends
86+
env: BUILD_TARGET=mac
87+
# build source
88+
- <<: *buildsrc
89+
env: BUILD_TARGET=arm-linux
90+
- <<: *buildsrc
91+
env: BUILD_TARGET=win32
92+
- <<: *buildsrc
93+
env: BUILD_TARGET=win64
94+
- <<: *buildsrc
95+
env: BUILD_TARGET=linux32
96+
- <<: *buildsrc
97+
env: BUILD_TARGET=linux64
98+
- <<: *buildsrc
99+
env: BUILD_TARGET=linux64_nowallet
100+
- <<: *buildsrc
101+
env: BUILD_TARGET=linux64_release DOCKER_BUILD=true
102+
- <<: *buildsrc
103+
env: BUILD_TARGET=mac
104+
# run tests (no tests for arm-linux and mac)
105+
- <<: *runtests
106+
env: BUILD_TARGET=win32
107+
- <<: *runtests
108+
env: BUILD_TARGET=win64
109+
- <<: *runtests
110+
env: BUILD_TARGET=linux32
111+
- <<: *runtests
112+
env: BUILD_TARGET=linux64
113+
- <<: *runtests
114+
env: BUILD_TARGET=linux64_nowallet
115+
- <<: *runtests
116+
env: BUILD_TARGET=linux64_release DOCKER_BUILD=true
117+
# build docker
118+
- <<: *builddocker
119+
env: BUILD_TARGET=linux64_release DOCKER_BUILD=true
45120

46121
before_cache:
47122
# Save builder image
@@ -50,9 +125,12 @@ before_cache:
50125
install:
51126
# Our scripts try to be Travis agnostic
52127
- export PULL_REQUEST="$TRAVIS_PULL_REQUEST"
128+
- export COMMIT_RANGE="$TRAVIS_COMMIT_RANGE"
53129
- export JOB_NUMBER="$TRAVIS_JOB_NUMBER"
54130
- export HOST_SRC_DIR=$TRAVIS_BUILD_DIR
55131
- export HOST_CACHE_DIR=$HOME/cache
132+
- export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
133+
- export PYTHON_DEBUG=1
56134
- source ./ci/matrix.sh
57135
- mkdir -p $HOST_CACHE_DIR/docker && mkdir -p $HOST_CACHE_DIR/ccache && mkdir -p $HOST_CACHE_DIR/depends && mkdir -p $HOST_CACHE_DIR/sdk-sources
58136
# Keep this as it makes caching related debugging easier

CMakeLists.txt

+18-13
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,45 @@ if(DEFINED DEPENDS_PREFIX)
3333
endif()
3434

3535
add_definitions(
36+
-DENABLE_CRASH_HOOKS=1
3637
-DENABLE_WALLET=1
3738
)
3839

3940
file(GLOB SOURCE_FILES
41+
src/*.cpp
42+
src/*.h
4043
src/bench/*.cpp
4144
src/bench/*.h
4245
src/bls/*.cpp
4346
src/bls/*.h
4447
src/compat/*.cpp
4548
src/compat/*.h
46-
src/consensus/*.h
4749
src/consensus/*.cpp
50+
src/consensus/*.h
4851
src/crypto/*.c
49-
src/crypto/*.h
5052
src/crypto/*.cpp
53+
src/crypto/*.h
54+
src/evo/*.cpp
55+
src/evo/*.h
5156
src/leveldb/db/*.cc
5257
src/leveldb/db/*.h
5358
src/leveldb/include/*.h
59+
src/llmq/*.cpp
60+
src/llmq/*.h
61+
src/masternode/*.cpp
62+
src/masternode/*.h
5463
src/policy/*.cpp
5564
src/policy/*.h
5665
src/primitives/*.cpp
5766
src/primitives/*.h
58-
src/qt/test/*.cpp
59-
src/qt/test/*.h
67+
src/privatesend/*.cpp
68+
src/privatesend/*.h
6069
src/qt/*.cpp
6170
src/qt/*.h
71+
src/qt/test/*.cpp
72+
src/qt/test/*.h
73+
src/rpc/*.cpp
74+
src/rpc/*.h
6275
src/script/*.cpp
6376
src/script/*.h
6477
src/secp256k1/include/*.h
@@ -67,19 +80,11 @@ file(GLOB SOURCE_FILES
6780
src/univalue/include/*.h
6881
src/univalue/lib/*.cpp
6982
src/univalue/lib/*.h
70-
src/wallet/test/*.cpp
7183
src/wallet/*.cpp
7284
src/wallet/*.h
85+
src/wallet/test/*.cpp
7386
src/zmq/*.cpp
7487
src/zmq/*.h
75-
src/*.cpp
76-
src/*.h
77-
src/evo/*.h
78-
src/evo/*.cpp
79-
src/llmq/*.h
80-
src/llmq/*.cpp
81-
src/rpc/*.cpp
82-
src/rpc/*.h
8388
)
8489

8590
add_executable(biblepay ${SOURCE_FILES})

0 commit comments

Comments
 (0)