Skip to content

Commit

Permalink
Problem: clang-format Travis job broken
Browse files Browse the repository at this point in the history
Solution: don't run configure
  • Loading branch information
bluca committed Mar 27, 2018
1 parent 8fb5b10 commit 099070c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
14 changes: 13 additions & 1 deletion builds/cmake/ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

set -x

cd ../..

# always install custom builds from dist
# to make sure that `make dist` doesn't omit any files required to build & test
if [ -z $DO_CLANG_FORMAT_CHECK ]; then
./autogen.sh
./configure
make -j5 dist-gzip
V=$(./version.sh)
tar -xzf zeromq-$V.tar.gz
cd zeromq-$V
fi

mkdir tmp
BUILD_PREFIX=$PWD/tmp

Expand Down Expand Up @@ -35,7 +48,6 @@ elif [ $CURVE == "libsodium" ]; then
fi

# Build, check, and install from local source
cd ../..
mkdir build_cmake
cd build_cmake
if [ "$DO_CLANG_FORMAT_CHECK" -eq "1" ] ; then
Expand Down
13 changes: 0 additions & 13 deletions ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,5 @@ if [ $BUILD_TYPE == "default" ]; then
make VERBOSE=1 -j5 distcheck
) || exit 1
else
# always install custom builds from dist
# to make sure that `make dist` doesn't omit any files required to build & test
# coverage, valgrind are special-case tests that aren't meant to be runnable from releases
if [ ${BUILD_TYPE} != "coverage" ] && [ ${BUILD_TYPE} != "valgrind" ]; then
./autogen.sh
./configure
make -j5 dist-gzip
V=$(./version.sh)
tar -xzf zeromq-$V.tar.gz
cd zeromq-$V
fi

# start the actual build from inside the dist
cd ./builds/${BUILD_TYPE} && ./ci_build.sh
fi

0 comments on commit 099070c

Please sign in to comment.