diff --git a/.travis-ci.sh b/.travis-ci.sh deleted file mode 100755 index b1fe649..0000000 --- a/.travis-ci.sh +++ /dev/null @@ -1,42 +0,0 @@ -## declare required packages - -OPAM_PACKAGES="cstruct lwt cohttp ssl ocamlfind shared-block-ring camldm cmdliner bisect mirage-block-volume" - -## different PPAs required to cover the test matrix - -case "$OCAML_VERSION,$OPAM_VERSION" in - 3.12.1,1.0.0) ppa=avsm/ocaml312+opam10 ;; - 3.12.1,1.1.0) ppa=avsm/ocaml312+opam11 ;; - 4.00.1,1.0.0) ppa=avsm/ocaml40+opam10 ;; - 4.00.1,1.1.0) ppa=avsm/ocaml40+opam11 ;; - 4.01.0,1.0.0) ppa=avsm/ocaml41+opam10 ;; - 4.01.0,1.1.0) ppa=avsm/ocaml41+opam11 ;; - 4.01.0,1.2.0) ppa=avsm/ocaml41+opam12 ;; - 4.02.0,1.2.0) ppa=avsm/ocaml42+opam12 ;; - *) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;; -esac - -## install OCaml and OPAM - -echo "yes" | sudo add-apt-repository ppa:$ppa -sudo apt-get update -qq -sudo apt-get install -qq ocaml ocaml-native-compilers camlp4-extra opam -export OPAMYES=1 -export OPAMVERBOSE=0 -echo OCaml version -ocaml -version -echo OPAM versions -opam --version -opam --git-version - -opam init -eval `opam config env` -opam remote add lvhd git://github.com/xapi-project/thin-lvhd-opam-repo -sudo apt-get install -qq `opam install ${OPAM_PACKAGES} -e ubuntu` -opam install ${OPAM_PACKAGES} - -## execute the build - -cd $TRAVIS_BUILD_DIR -make -sudo ./test.sh diff --git a/.travis.yml b/.travis.yml index c9d88bc..351bdb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,5 @@ language: c install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh script: bash -ex .travis-opam.sh && bash -ex test.sh env: - - OCAML_VERSION=4.02 PACKAGE=thin_lvhd_tools FORK_USER=djs55 EXTRA_REMOTE=git://github.com/xapi-project/thin-lvhd-opam-repo + - OCAML_VERSION=4.02 PACKAGE=thin_lvhd_tools EXTRA_REMOTES="git://github.com/xapi-project/thin-lvhd-opam-repo" sudo: required