Skip to content

Commit

Permalink
refresh travis; no mirage needed
Browse files Browse the repository at this point in the history
  • Loading branch information
avsm committed Dec 20, 2013
1 parent fe45baa commit be48565
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 25 deletions.
24 changes: 2 additions & 22 deletions .travis-ci.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## declare required packages

## ssl needed below to get the Lwt_unix version of cohttp
OPAM_PACKAGES="mirage mirage-net cow mirage-fs ssl cohttp omd"
OPAM_PACKAGES="cow ssl cohttp"

## different PPAs required to cover the test matrix

Expand All @@ -15,18 +15,6 @@ case "$OCAML_VERSION,$OPAM_VERSION" in
*) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;;
esac

## determine Mirage backend

case "$MIRAGE_BACKEND" in
unix-socket) mirage_pkg="mirage-unix mirage-net-socket" ;;
unix-direct) mirage_pkg="mirage-unix mirage-net-direct" ;;
xen) mirage_pkg="mirage-xen" ;;
*)
echo Unknown backend $MIRAGE_BACKEND
exit 1
;;
esac

## install OCaml and OPAM

echo "yes" | sudo add-apt-repository ppa:$ppa
Expand All @@ -42,15 +30,7 @@ opam --git-version

opam init
eval `opam config env`

## install Mirage

opam install $mirage_pkg ${OPAM_PACKAGES}

## execute the build

cd $TRAVIS_BUILD_DIR
make configure
./configure
make build
make doc
make test
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: c
script: bash -ex .travis-ci.sh
env:
- OCAML_VERSION=4.01.0 MIRAGE_BACKEND=unix-socket OPAM_VERSION=1.1.0
- OCAML_VERSION=4.01.0 MIRAGE_BACKEND=unix-direct OPAM_VERSION=1.1.0
- OCAML_VERSION=4.01.0 MIRAGE_BACKEND=xen OPAM_VERSION=1.1.0
- OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0
- OCAML_VERSION=4.00.1 OPAM_VERSION=1.1.0

0 comments on commit be48565

Please sign in to comment.