You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
- if [ "$CHECK_DOC" = 1 ]; then git fetch --unshallow; fi
51
-
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi
52
-
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/git-subtree-check.sh src/crypto/ctaes; fi
53
-
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/git-subtree-check.sh src/secp256k1; fi
54
-
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/git-subtree-check.sh src/univalue; fi
55
-
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/git-subtree-check.sh src/leveldb; fi
56
-
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi
57
-
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-rpc-mappings.py .; fi
58
-
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/lint-all.sh; fi
59
-
- unset CC; unset CXX
44
+
- DOCKER_EXEC echo \> \$HOME/.digibyte # Make sure default datadir does not exist and is never read by creating a dummy file
60
45
- mkdir -p depends/SDKs depends/sdk-sources
61
46
- if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
62
47
- if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
63
-
- if [ -z "$NO_DEPENDS" ]; then make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS; fi
64
-
# Start xvfb if needed, as documented at https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to-Run-Tests-That-Require-a-GUI
65
-
- if [ "$NEED_XVFB" = 1 ]; then export DISPLAY=:99.0; /sbin/start-stop-daemon --start --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac; fi
48
+
- if [[ $HOST = *-mingw32 ]]; then DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\); fi
49
+
- if [ -z "$NO_DEPENDS" ]; then DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS; fi
66
50
script:
67
-
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "digibyte/digibyte" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi
68
-
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "digibyte/digibyte" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi
- if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD unit-tests; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1; END_FOLD; fi
63
+
- if [ "$RUN_BENCH" = "true" ]; then BEGIN_FOLD bench; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib $OUTDIR/bin/bench_digibyte -scaling=0.001 ; END_FOLD; fi
83
64
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash"; fi
84
-
- if [ "$RUN_TESTS" = "true" ]; then test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet ${extended}; fi
65
+
- if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD functional-tests; DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}; END_FOLD; fi
should be used to discuss complicated or controversial changes before working on
36
+
a patch set.
37
+
17
38
18
39
Contributor Workflow
19
40
--------------------
@@ -98,6 +119,8 @@ At this stage one should expect comments and review from other contributors. You
98
119
can add more commits to your pull request by committing them locally and pushing
99
120
to your fork until you have satisfied all feedback.
100
121
122
+
Note: Code review is a burdensome but important part of the development process, and as such, certain types of pull requests are rejected. In general, if the **improvements** do not warrant the **review effort** required, the PR has a high chance of being rejected. It is up to the PR author to convince the reviewers that the changes warrant the review effort, and if reviewers are "Concept NAK'ing" the PR, the author may need to present arguments and/or do research backing their suggested changes.
123
+
101
124
Squashing Commits
102
125
---------------------------
103
126
If your pull request is accepted for merging, you may be asked by a maintainer
@@ -106,10 +129,10 @@ before it will be merged. The basic squashing workflow is shown below.
106
129
107
130
git checkout your_branch_name
108
131
git rebase -i HEAD~n
109
-
# n is normally the number of commits in the pull
110
-
# set commits from 'pick' to 'squash', save and quit
111
-
# on the next screen, edit/refine commit messages
112
-
# save and quit
132
+
# n is normally the number of commits in the pull request.
133
+
# Set commits (except the one in the first line) from 'pick' to 'squash', save and quit.
134
+
# On the next screen, edit/refine commit messages.
135
+
# Save and quit.
113
136
git push -f # (force push to GitHub)
114
137
115
138
If you have problems with squashing (or other workflows with `git`), you can
Copy file name to clipboardExpand all lines: build-aux/m4/ax_boost_chrono.m4
+1-2Lines changed: 1 addition & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -81,7 +81,6 @@ AC_DEFUN([AX_BOOST_CHRONO],
81
81
82
82
LDFLAGS_SAVE=$LDFLAGS
83
83
if test "x$ax_boost_user_chrono_lib" = "x"; then
84
-
ax_lib=
85
84
for libextension in `ls $BOOSTLIBDIR/libboost_chrono*.so* $BOOSTLIBDIR/libboost_chrono*.dylib* $BOOSTLIBDIR/libboost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_chrono.*\)\.so.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.a.*$;\1;'` ; do
0 commit comments