Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update Travis for 1.0

  • Loading branch information...
commit eca9f1673f5500c3d5bc3d04bf63f767eb26293a 1 parent ef44b6b
@avsm authored
Showing with 7 additions and 28 deletions.
  1. +3 −24 .travis-ci.sh
  2. +4 −4 .travis.yml
View
27 .travis-ci.sh
@@ -1,5 +1,5 @@
# OPAM packages needed to build tests.
-OPAM_PACKAGES="mirage.0.9.8 cstruct.0.8.1 mirage-net.0.9.4 cow mirage-fs mirari cohttp"
+OPAM_PACKAGES="mirage cow"
case "$OCAML_VERSION,$OPAM_VERSION" in
3.12.1,1.0.0) ppa=avsm/ocaml312+opam10 ;;
@@ -24,28 +24,7 @@ opam --git-version
opam init git://github.com/ocaml/opam-repository >/dev/null 2>&1
eval `opam config env`
-
-case "$MIRAGE_BACKEND" in
-unix-socket)
- mirage_pkg="mirage-unix.0.9.8 mirage-net-socket"
- ;;
-unix-direct)
- mirage_pkg="mirage-unix.0.9.8 mirage-net-direct"
- ;;
-xen)
- mirage_pkg="mirage-xen.0.9.8"
- ;;
-*)
- echo Unknown backend $MIRAGE_BACKEND
- exit 1
-esac
-
-opam install $mirage_pkg ${OPAM_PACKAGES}
-cd $TRAVIS_BUILD_DIR
-./default_build.sh
-cp .travis-www.conf src/www.conf
-make clean
-./default_build.sh
+make MODE=$MIRAGE_BACKEND
if [ "$DEPLOY" = "1" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
# get the secure key out for deployment
@@ -67,7 +46,7 @@ if [ "$DEPLOY" = "1" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
cd mirage-www-deployment
rm -rf xen/$TRAVIS_COMMIT
mkdir -p xen/$TRAVIS_COMMIT
- cp ../src/mir-www.xen ../src/mir-www.map ../src/www.conf xen/$TRAVIS_COMMIT
+ cp ../src/mir-main.xen ../src/www.conf xen/$TRAVIS_COMMIT
bzip2 -9 xen/$TRAVIS_COMMIT/mir-www.xen
git pull --rebase
echo $TRAVIS_COMMIT > xen/latest
View
8 .travis.yml
@@ -2,10 +2,10 @@ language: c
script: bash -ex .travis-ci.sh
env:
matrix:
- - OCAML_VERSION=4.01.0 MIRAGE_BACKEND=unix-direct OPAM_VERSION=1.1.0
- - OCAML_VERSION=4.01.0 MIRAGE_BACKEND=unix-socket OPAM_VERSION=1.1.0
- - OCAML_VERSION=4.00.1 MIRAGE_BACKEND=unix-direct OPAM_VERSION=1.1.0
- - OCAML_VERSION=4.00.1 MIRAGE_BACKEND=xen OPAM_VERSION=1.1.0 DEPLOY=1
+ - OCAML_VERSION=4.01.0 MIRAGE_BACKEND=unix OPAM_VERSION=1.1.0
+ - OCAML_VERSION=4.01.0 MIRAGE_BACKEND=xen OPAM_VERSION=1.1.0 DEPLOY=1
+ - OCAML_VERSION=4.00.1 MIRAGE_BACKEND=unix OPAM_VERSION=1.1.0
+ - OCAML_VERSION=4.00.1 MIRAGE_BACKEND=xen OPAM_VERSION=1.1.0
global:
- secure: PUu3+Enupf9jcIPD/hs5b6zrNuJagTDXJGtYfSUIFvzevSXZzs6mXPu8L2vvAQbQ8ig/8VLToa44vUTG9OEy9SxXrR6yTQGfj4YxJ5BXKHwhYMTBXnR1e+S1gA4a5tilMa7M/a0hWa1rORv3diMIK3dihjc1m6VzpCK/4vly7KU=
- secure: crnwZ3MDUA9szI/EuwB9o7plXVF2QCx+JpOazy4SwC2v47Vf5voOEAxh7iFMgGziBqzKGVnDw4/37WHVm5vdgaL4lL2T73F1PqXbiCdhhwZVcf+EAXr8KmoaNXRieL7qPsemQVvPWUiERZRmR2okvm60EqifZA9/dy/48dJIGMI=
Please sign in to comment.
Something went wrong with that request. Please try again.