generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove cmake tests from travis builds for now.

Browse Source 
This seemed like it should be easy, but apparently there are a lot of
gotchas that need to be ironed out in a branch first.
This commit is contained in:
Brent Cook 2015-09-09 07:45:54 -05:00
parent e04dfb2b27
commit 1c2a3f25e2
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/travis
View File

@ -4,7 +4,6 @@ set -e
./autogen.sh ./autogen.sh
if [ "x$ARCH" = "xnative" ]; then if [ "x$ARCH" = "xnative" ]; then
# test autotools
./configure ./configure
if [ `uname` = "Darwin" ]; then if [ `uname` = "Darwin" ]; then
# OS X runs out of resources if we run 'make -j check' # OS X runs out of resources if we run 'make -j check'
@ -12,25 +11,6 @@ if [ "x$ARCH" = "xnative" ]; then
else else
make -j distcheck make -j distcheck
fi fi
# make distribution
make dist
tar zxvf libressl-*.tar.gz
cd libressl-*
mkdir build
cd build
# test cmake and ninja
if [ `uname` = "Darwin" ]; then
cmake ..
make
else
sudo apt-add-repository -y ppa:kalakris/cmake
sudo apt-get update
sudo apt-get install -y cmake ninja-build
cmake .. -GNinja
ninja
fi
else else
CPU=i686 CPU=i686
if [ "x$ARCH" = "xmingw64" ]; then if [ "x$ARCH" = "xmingw64" ]; then
@ -38,8 +18,10 @@ else
fi fi
export CC=$CPU-w64-mingw32-gcc export CC=$CPU-w64-mingw32-gcc
if hash $CC 2>/dev/null; then if [ -z $(which $CC) ]; then
# Update Ubuntu 12.04 with current mingw toolchain # Update Ubuntu 12.04 with current mingw toolchain
sudo apt-get update
sudo apt-get install -y python-software-properties
sudo apt-add-repository -y ppa:tobydox/mingw-x-precise sudo apt-add-repository -y ppa:tobydox/mingw-x-precise
sudo apt-get update sudo apt-get update
sudo apt-get install -y $ARCH-x-gcc make sudo apt-get install -y $ARCH-x-gcc make