Merge pull request #238 from Arkshine/feature/container-build

Use the new Travis-CI Container environment
This commit is contained in:
Vincent Herbet 2015-04-19 21:05:42 +02:00
commit 08d684a90f
2 changed files with 15 additions and 5 deletions

View File

@ -1,11 +1,21 @@
addons:
apt:
packages:
- lib32stdc++6
- lib32z1-dev
- libc6-dev-i386
- gcc-multilib
- g++-multilib
language: cpp
sudo: false
compiler:
- clang
before_script:
- sudo apt-get update -qq
- sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev
- CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/support/checkout-deps.sh --no-mysql && cd $CHECKOUT_DIR
- CHECKOUT_DIR=$PWD && cd ..
- chmod a+x $CHECKOUT_DIR/support/checkout-deps.sh
- $CHECKOUT_DIR/support/checkout-deps.sh --no-mysql && cd $CHECKOUT_DIR
script:
- mkdir build && cd build
- PATH="~/.local/bin:$PATH"
- python ../configure.py --enable-optimize --no-mysql
- ambuild

View File

@ -91,7 +91,7 @@ if [ $? -eq 1 ]; then
python setup.py install
else
python setup.py build
echo "About to install AMBuild - press Ctrl+C to abort, otherwise enter your password for sudo."
sudo python setup.py install
echo "Installing AMBuild at the user level. Location can be: ~/.local/bin"
python setup.py install --user
fi
fi