.travis.yml: experiment with windows builders.

diff --git a/.travis.yml b/.travis.yml
index 519c50596f38873845f8d6a429f4e88fa566c251..12eb70a64fe1dc337c2769120b336e8a1d5d4d4f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ compiler:
 os:
   - linux
   - osx
+  - windows
 sudo: required
 services:
   - postgresql
@@ -30,6 +31,7 @@ before_install:
         brew install redis
         brew install zeromq
         brew install postgresql
+        brew install udis86
         brew services start memcached
         brew services start redis
         brew services start postgresql
@@ -41,13 +43,9 @@ before_install:
         apt-get install libsnappy-dev
         apt-get install libzmq-dev
         apt-get install libpq-dev
+        wget https://github.com/vmt/udis86/archive/v1.7.2.tar.gz && tar xzvf v1.7.2.tar.gz && cd udis86-1.7.2/ && ./autogen.sh && ./configure --enable-shared=yes && make && sudo make install && cd ..
         ;;
     esac
-  - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
-      wget https://github.com/vmt/udis86/archive/v1.7.2.tar.gz && tar xzvf v1.7.2.tar.gz &&
-      ( cd udis86-1.7.2/ && ./autogen.sh && ./configure --enable-shared=yes && make && sudo make install ) &&
-      ( [[ "$TRAVIS_OS_NAME" != "osx" ]] && sudo ldconfig || true );
-    fi
   - git remote set-branches --add origin master
   - git remote set-branches --add origin clean-windows-x86-64
   - git remote set-branches --add origin clean-windows-x86-32
@@ -60,9 +58,18 @@ script:
   - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, TRAVIS_PULL_REQUEST_BRANCH=$TRAVIS_PULL_REQUEST_BRANCH"
   - export CI_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
   - echo "CI_BRANCH=${CI_BRANCH}"
-  - DEBUG=1 ./build.sh net-bootstrap < /dev/null
-  - "./factor -e='USING: memory vocabs.hierarchy tools.test namespaces ; \"zealot\" load f long-unit-tests-enabled? set-global save'"
-  #- './factor -run=zealot.cli-changed-vocabs'
-  #- './factor -run=tools.test `./factor -run=zealot.cli-changed-vocabs | paste -s -d " " -`'
-  #- './factor -run=zealot.help-lint `./factor -run=zealot.cli-changed-vocabs | paste -s -d " " -`'
-  - "./factor -e='USING: modern.paths sequences tools.test.private ; core-vocabs [ test-vocab ] each'"
+  - |-
+    case $TRAVIS_OS_NAME in
+      osx | linux)
+        DEBUG=1 build.sh net-bootstrap < /dev/null
+        ;;
+      windows)
+        build.cmd
+        ;;
+    esac
+    fi
+  - factor -e='USING: memory vocabs.hierarchy tools.test namespaces ; \"zealot\" load f long-unit-tests-enabled? set-global save'
+  #- factor -run=zealot.cli-changed-vocabs
+  #- factor -run=tools.test `./factor -run=zealot.cli-changed-vocabs | paste -s -d " " -`
+  #- factor -run=zealot.help-lint `./factor -run=zealot.cli-changed-vocabs | paste -s -d " " -`
+  - factor -e='USING: modern.paths sequences tools.test.private ; core-vocabs [ test-vocab ] each'