diff options
| author | lloyd <[email protected]> | 2015-03-29 01:11:33 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2015-03-29 01:11:33 +0000 |
| commit | 04964046a52693f78fe2260d57c8c73c42b3d7a4 (patch) | |
| tree | 20d31297d5a8fc8e7ce0141ed2bf4d9d092a0285 /.travis.yml | |
| parent | 6766008e977b671e1e1fa27d02e3d71404b1655b (diff) | |
Give up on x86-32 CI build for now
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 6080a5139..edfcc9a74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,16 +10,15 @@ before_install: install: - sudo apt-get install -y g++-4.8 - - sudo apt-get install -y gcc-4.8-multilib - sudo apt-get install -y libssl-dev - - sudo apt-get install -y libz-dev lib32z1-dev + - sudo apt-get install -y libz-dev - sudo apt-get install -y libsqlite3-dev - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 90 script: - $CXX --version - - python configure.py $BUILD_MODE --cpu=$CPU --cc=$CC --cc-abi-flags=$CC_ABI_FLAGS --cc-bin=$CXX --with-openssl --with-sqlite --with-zlib + - python configure.py $BUILD_MODE --cc=$CC --cc-bin=$CXX --with-openssl --with-sqlite --with-zlib - "make" - "LD_LIBRARY_PATH=. ./botan-test" @@ -30,7 +29,5 @@ os: - linux env: - - CPU="x86_64" BUILD_MODE="" - - CPU="x86_64" BUILD_MODE="--via-amalgamation --disable-shared" - - CPU="x86_32" CC_ABI_FLAGS="-m32" BUILD_MODE="" - - CPU="x86_32" CC_ABI_FLAGS="-m32" BUILD_MODE="--via-amalgamation --disable-shared" + - BUILD_MODE="" + - BUILD_MODE="--via-amalgamation --disable-shared" |