Skip to content

Commit 1b68de3

Browse files
committed
Merge #7620: [travis] Only run check-doc.py once
fa1b80d [travis] Only run check-doc.py once (MarcoFalke)
2 parents 409f843 + fa1b80d commit 1b68de3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ env:
1717
global:
1818
- MAKEJOBS=-j3
1919
- RUN_TESTS=false
20+
- CHECK_DOC=0
2021
- BOOST_TEST_RANDOM=1$TRAVIS_BUILD_ID
2122
- CCACHE_SIZE=100M
2223
- CCACHE_TEMPDIR=/tmp/.ccache-temp
@@ -35,7 +36,7 @@ matrix:
3536
fast_finish: true
3637
include:
3738
- compiler: ": ARM"
38-
env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
39+
env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
3940
- compiler: ": Win32"
4041
env: HOST=i686-w64-mingw32 PPA="ppa:ubuntu-wine/ppa" PACKAGES="nsis gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-dev wine1.7 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2"
4142
- compiler: ": 32-bit + dash"
@@ -67,10 +68,10 @@ script:
6768
- BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
6869
- depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE
6970
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then export CCACHE_READONLY=1; fi
71+
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi
7072
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
7173
- ./configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
7274
- make distdir PACKAGE=bitcoin VERSION=$HOST
73-
- if [ "$RUN_TESTS" = "true" ]; then contrib/devtools/check-doc.py; fi
7475
- cd bitcoin-$HOST
7576
- ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
7677
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )

0 commit comments

Comments
 (0)