diff --git a/.travis.yml b/.travis.yml index 47a90cf..17ef624 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,18 +33,15 @@ matrix: - env: METHOD=brew - env: METHOD=ci LISP=sbcl/git include: - - sudo: required - os: linux - env: METHOD=cross XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" PREFIX="--prefix=/usr/i686-w64-mingw32" - - sudo: required - os: linux - env: METHOD=debian - sudo: required os: linux env: METHOD=valgrind XCFLAGS="-g -O0" - sudo: required os: linux env: METHOD=documents + - sudo: required + os: linux + env: METHOD=debian #branches: # except: @@ -61,9 +58,9 @@ addons: before_install: - date - - if [ $METHOD = cross ]; then find . \( -name \*.c -o -name \*.h \) -type f|xargs wc -l -c; fi - - if [ $METHOD = cross ]; then find . \( -name \*.lisp -o -name \*.ros \) -type f|xargs wc -l -c; fi - - if [ $METHOD = cross ] || [ $METHOD = debian ] || [ $METHOD = documents ] || [ $METHOD = valgrind ]; then + - if [ $METHOD = documents ]; then find . \( -name \*.c -o -name \*.h \) -type f|xargs wc -l -c; fi + - if [ $METHOD = documents ]; then find . \( -name \*.lisp -o -name \*.ros \) -type f|xargs wc -l -c; fi + - if [ $METHOD = debian ] || [ $METHOD = documents ] || [ $METHOD = valgrind ]; then sudo apt-get -qq update --force-yes > /dev/null; fi - if [ $METHOD = brew ] && [ $TRAVIS_OS_NAME = linux ]; then yes ""| ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/linuxbrew/go/install)"; fi @@ -79,11 +76,6 @@ install: - mkdir ~/.roswell - echo "ros.proxy 0 localhost:5000" > ~/.roswell/config - echo "proxy.http.only 0 1" >> ~/.roswell/config - - if [ x$METHOD != xci ]; then - echo "sbcl-bin-version-uri 0 https://github.com/roswell/sbcl_bin/releases/download/files/build.html" >> ~/.roswell/config; - echo "sbcl-bin-uri 0 https://github.com/roswell/sbcl_bin/releases/download/" >> ~/.roswell/config; - fi - - if [ x$TRAVIS_TAG != x ] && [ $METHOD = cross ]; then sudo apt-get install -qq lcab > /dev/null; fi - if [ $METHOD = debian ]; then sudo apt-get install -qq debhelper dh-autoreconf fakeroot; fi - if [ $METHOD = documents ]; then sudo apt-get install -qq pandoc ruby-sass; pandoc -v; fi - if [ $METHOD = valgrind ]; then sudo apt-get install -qq valgrind > /dev/null; fi @@ -102,17 +94,13 @@ script: fi - if [ "$METHOD" = "brew" ]; then brew install roswell --HEAD; fi - if [ "$METHOD" = "ci" ]; then sh ./scripts/install-for-ci.sh; fi - - if [ "$METHOD" = "cross" ] || [ "$METHOD" = "valgrind" ] || [ $METHOD = debian ]; then + - if [ "$METHOD" = "valgrind" ] || [ $METHOD = debian ]; then sh bootstrap; CFLAGS=$XCFLAGS ./configure --disable-dependency-tracking --disable-maintainer-mode; make; sudo make install; make maintainer-clean; fi - - if [ "$METHOD" = "cross" ]; then - CC=$XCC ./configure ${PREFIX} ${HOST}; - make; - fi - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros version; ros version=t run; @@ -144,10 +132,6 @@ script: after_success: - $HOME/.rosproxy/proxy daemon - - if [ x$TRAVIS_TAG != x ] && [ $METHOD = cross ]; then - lcab -q src/ros.exe lisp/* ros-$XCC.cab; - ros ./scripts/release.ros github ros-$XCC.cab; - fi - if [ x$TRAVIS_TAG != x ] && [ $METHOD = debian ]; then ros ./scripts/release.ros debian; fi